1. Add missed mp_bitcnt_t changes

(no author) · (no author) · commit bacbb41a6be2 · 2010-02-08T18:12:26.000Z
2. Update Windows builds (exclude pre_divrem.c now in assembler)
diff --git a/build.vc9/dll_mpir_core2/dll_mpir_core2.vcproj b/build.vc9/dll_mpir_core2/dll_mpir_core2.vcproj
@@ -1671,6 +1671,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1679,6 +1680,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
diff --git a/build.vc9/dll_mpir_k10/dll_mpir_k10.vcproj b/build.vc9/dll_mpir_k10/dll_mpir_k10.vcproj
@@ -1675,6 +1675,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1683,6 +1684,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
diff --git a/build.vc9/dll_mpir_k8/dll_mpir_k8.vcproj b/build.vc9/dll_mpir_k8/dll_mpir_k8.vcproj
@@ -1677,6 +1677,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1685,6 +1686,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
diff --git a/build.vc9/dll_mpir_nehalem/dll_mpir_nehalem.vcproj b/build.vc9/dll_mpir_nehalem/dll_mpir_nehalem.vcproj
@@ -1673,6 +1673,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1681,6 +1682,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
diff --git a/build.vc9/lib_mpir_core2/lib_mpir_core2.vcproj b/build.vc9/lib_mpir_core2/lib_mpir_core2.vcproj
@@ -3567,6 +3567,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3575,6 +3576,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
diff --git a/build.vc9/lib_mpir_k10/lib_mpir_k10.vcproj b/build.vc9/lib_mpir_k10/lib_mpir_k10.vcproj
@@ -3573,6 +3573,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3581,6 +3582,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
diff --git a/build.vc9/lib_mpir_k8/lib_mpir_k8.vcproj b/build.vc9/lib_mpir_k8/lib_mpir_k8.vcproj
@@ -3573,6 +3573,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3581,6 +3582,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
diff --git a/build.vc9/lib_mpir_nehalem/lib_mpir_nehalem.vcproj b/build.vc9/lib_mpir_nehalem/lib_mpir_nehalem.vcproj
@@ -3567,6 +3567,7 @@
 					>
 					<FileConfiguration
 						Name="Debug|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -3575,6 +3576,7 @@
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
+						ExcludedFromBuild="true"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -4432,20 +4434,6 @@
 					<File
 						RelativePath="..\..\mpn\x86_64w\divrem_2.asm"
 						>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="YASM"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="..\..\mpn\x86_64w\divrem_euclidean_qr_1.asm"
diff --git a/gmp-h.in b/gmp-h.in
@@ -911,7 +911,7 @@ __GMP_DECLSPEC void mpz_import __GMP_PROTO ((mpz_ptr, size_t, int, size_t, int,
 __GMP_DECLSPEC void mpz_init __GMP_PROTO ((mpz_ptr));
 
 #define mpz_init2 __gmpz_init2
-__GMP_DECLSPEC void mpz_init2 __GMP_PROTO ((mpz_ptr, unsigned long));
+__GMP_DECLSPEC void mpz_init2 __GMP_PROTO ((mpz_ptr, mp_bitcnt_t));
 
 #define mpz_init_set __gmpz_init_set
 __GMP_DECLSPEC void mpz_init_set __GMP_PROTO ((mpz_ptr, mpz_srcptr));
@@ -1052,7 +1052,7 @@ __GMP_DECLSPEC int mpz_probable_prime_p __GMP_PROTO ((mpz_srcptr,gmp_randstate_t
 __GMP_DECLSPEC int mpz_likely_prime_p __GMP_PROTO ((mpz_srcptr,gmp_randstate_t, unsigned long));
 
 #define mpz_realloc2 __gmpz_realloc2
-__GMP_DECLSPEC void mpz_realloc2 __GMP_PROTO ((mpz_ptr, unsigned long));
+__GMP_DECLSPEC void mpz_realloc2 __GMP_PROTO ((mpz_ptr, mp_bitcnt_t));
 
 #define mpz_remove __gmpz_remove
 __GMP_DECLSPEC unsigned long int mpz_remove __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
@@ -1379,7 +1379,7 @@ __GMP_DECLSPEC unsigned long mpf_get_ui __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW
 __GMP_DECLSPEC void mpf_init __GMP_PROTO ((mpf_ptr));
 
 #define mpf_init2 __gmpf_init2
-__GMP_DECLSPEC void mpf_init2 __GMP_PROTO ((mpf_ptr, unsigned long int));
+__GMP_DECLSPEC void mpf_init2 __GMP_PROTO ((mpf_ptr, mp_bitcnt_t));
 
 #define mpf_init_set __gmpf_init_set
 __GMP_DECLSPEC void mpf_init_set __GMP_PROTO ((mpf_ptr, mpf_srcptr));
diff --git a/mpf/init2.c b/mpf/init2.c
@@ -23,7 +23,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpf_init2 (mpf_ptr r, unsigned long int prec_in_bits)
+mpf_init2 (mpf_ptr r, mp_bitcnt_t prec_in_bits)
 {
   mp_size_t prec;
 
diff --git a/mpz/init2.c b/mpz/init2.c
@@ -23,7 +23,7 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 void
-mpz_init2 (mpz_ptr x, unsigned long bits)
+mpz_init2 (mpz_ptr x, mp_bitcnt_t bits)
 {
   mp_size_t  limbs;
   limbs = (bits + GMP_NUMB_BITS-1) / GMP_NUMB_BITS;

Original file line number	Diff line number	Diff line change
`@@ -1671,6 +1671,7 @@`
`1671`	`1671`	`>`
`1672`	`1672`	`<FileConfiguration`
`1673`	`1673`	`Name="Debug\|x64"`
	`1674`	`+ ExcludedFromBuild="true"`
`1674`	`1675`	`>`
`1675`	`1676`	`<Tool`
`1676`	`1677`	`Name="VCCLCompilerTool"`
`@@ -1679,6 +1680,7 @@`
`1679`	`1680`	`</FileConfiguration>`
`1680`	`1681`	`<FileConfiguration`
`1681`	`1682`	`Name="Release\|x64"`
	`1683`	`+ ExcludedFromBuild="true"`
`1682`	`1684`	`>`
`1683`	`1685`	`<Tool`
`1684`	`1686`	`Name="VCCLCompilerTool"`
Original file line number	Diff line number	Diff line change
`@@ -1675,6 +1675,7 @@`
`1675`	`1675`	`>`
`1676`	`1676`	`<FileConfiguration`
`1677`	`1677`	`Name="Debug\|x64"`
	`1678`	`+ ExcludedFromBuild="true"`
`1678`	`1679`	`>`
`1679`	`1680`	`<Tool`
`1680`	`1681`	`Name="VCCLCompilerTool"`
`@@ -1683,6 +1684,7 @@`
`1683`	`1684`	`</FileConfiguration>`
`1684`	`1685`	`<FileConfiguration`
`1685`	`1686`	`Name="Release\|x64"`
	`1687`	`+ ExcludedFromBuild="true"`
`1686`	`1688`	`>`
`1687`	`1689`	`<Tool`
`1688`	`1690`	`Name="VCCLCompilerTool"`
Original file line number	Diff line number	Diff line change
`@@ -1677,6 +1677,7 @@`
`1677`	`1677`	`>`
`1678`	`1678`	`<FileConfiguration`
`1679`	`1679`	`Name="Debug\|x64"`
	`1680`	`+ ExcludedFromBuild="true"`
`1680`	`1681`	`>`
`1681`	`1682`	`<Tool`
`1682`	`1683`	`Name="VCCLCompilerTool"`
`@@ -1685,6 +1686,7 @@`
`1685`	`1686`	`</FileConfiguration>`
`1686`	`1687`	`<FileConfiguration`
`1687`	`1688`	`Name="Release\|x64"`
	`1689`	`+ ExcludedFromBuild="true"`
`1688`	`1690`	`>`
`1689`	`1691`	`<Tool`
`1690`	`1692`	`Name="VCCLCompilerTool"`
Original file line number	Diff line number	Diff line change
`@@ -1673,6 +1673,7 @@`
`1673`	`1673`	`>`
`1674`	`1674`	`<FileConfiguration`
`1675`	`1675`	`Name="Debug\|x64"`
	`1676`	`+ ExcludedFromBuild="true"`
`1676`	`1677`	`>`
`1677`	`1678`	`<Tool`
`1678`	`1679`	`Name="VCCLCompilerTool"`
`@@ -1681,6 +1682,7 @@`
`1681`	`1682`	`</FileConfiguration>`
`1682`	`1683`	`<FileConfiguration`
`1683`	`1684`	`Name="Release\|x64"`
	`1685`	`+ ExcludedFromBuild="true"`
`1684`	`1686`	`>`
`1685`	`1687`	`<Tool`
`1686`	`1688`	`Name="VCCLCompilerTool"`
Original file line number	Diff line number	Diff line change
`@@ -3567,6 +3567,7 @@`
`3567`	`3567`	`>`
`3568`	`3568`	`<FileConfiguration`
`3569`	`3569`	`Name="Debug\|x64"`
	`3570`	`+ ExcludedFromBuild="true"`
`3570`	`3571`	`>`
`3571`	`3572`	`<Tool`
`3572`	`3573`	`Name="VCCLCompilerTool"`
`@@ -3575,6 +3576,7 @@`
`3575`	`3576`	`</FileConfiguration>`
`3576`	`3577`	`<FileConfiguration`
`3577`	`3578`	`Name="Release\|x64"`
	`3579`	`+ ExcludedFromBuild="true"`
`3578`	`3580`	`>`
`3579`	`3581`	`<Tool`
`3580`	`3582`	`Name="VCCLCompilerTool"`
Original file line number	Diff line number	Diff line change
`@@ -3573,6 +3573,7 @@`
`3573`	`3573`	`>`
`3574`	`3574`	`<FileConfiguration`
`3575`	`3575`	`Name="Debug\|x64"`
	`3576`	`+ ExcludedFromBuild="true"`
`3576`	`3577`	`>`
`3577`	`3578`	`<Tool`
`3578`	`3579`	`Name="VCCLCompilerTool"`
`@@ -3581,6 +3582,7 @@`
`3581`	`3582`	`</FileConfiguration>`
`3582`	`3583`	`<FileConfiguration`
`3583`	`3584`	`Name="Release\|x64"`
	`3585`	`+ ExcludedFromBuild="true"`
`3584`	`3586`	`>`
`3585`	`3587`	`<Tool`
`3586`	`3588`	`Name="VCCLCompilerTool"`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ MA 02110-1301, USA. */`
`23`	`23`	`#include "gmp-impl.h"`
`24`	`24`
`25`	`25`	`void`
`26`		`-mpf_init2 (mpf_ptr r, unsigned long int prec_in_bits)`
	`26`	`+mpf_init2 (mpf_ptr r, mp_bitcnt_t prec_in_bits)`
`27`	`27`	`{`
`28`	`28`	`mp_size_t prec;`
`29`	`29`