[Python-checkins] r86322 - in python/branches/py3k-cdecimal: Modules/cdecimal/mptest.h PCbuild/cdecimal.vcproj

stefan.krah python-checkins at python.org
Mon Nov 8 16:59:56 CET 2010


Author: stefan.krah
Date: Mon Nov  8 16:59:56 2010
New Revision: 86322

Log:
Fix Windows build.

Modified:
   python/branches/py3k-cdecimal/Modules/cdecimal/mptest.h
   python/branches/py3k-cdecimal/PCbuild/cdecimal.vcproj

Modified: python/branches/py3k-cdecimal/Modules/cdecimal/mptest.h
==============================================================================
--- python/branches/py3k-cdecimal/Modules/cdecimal/mptest.h	(original)
+++ python/branches/py3k-cdecimal/Modules/cdecimal/mptest.h	Mon Nov  8 16:59:56 2010
@@ -9,24 +9,21 @@
 
 
 #include "mpdecimal.h"
-#ifndef _MSC_VER
-  #define IMPORTEXPORT
-#endif
 
 
 /* newton division undergoes the same rigorous tests as standard division */
-IMPORTEXPORT void mpd_test_newtondiv(mpd_t *q, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
-IMPORTEXPORT void mpd_test_newtondivint(mpd_t *q, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
-IMPORTEXPORT void mpd_test_newtonrem(mpd_t *r, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
-IMPORTEXPORT void mpd_test_newtondivmod(mpd_t *q, mpd_t *r, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
+void mpd_test_newtondiv(mpd_t *q, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
+void mpd_test_newtondivint(mpd_t *q, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
+void mpd_test_newtonrem(mpd_t *r, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
+void mpd_test_newtondivmod(mpd_t *q, mpd_t *r, const mpd_t *a, const mpd_t *b, mpd_context_t *ctx);
 
 /* fenv */
-IMPORTEXPORT unsigned int mpd_set_fenv(void);
-IMPORTEXPORT void mpd_restore_fenv(unsigned int);
+unsigned int mpd_set_fenv(void);
+void mpd_restore_fenv(unsigned int);
 
-IMPORTEXPORT mpd_uint_t *_mpd_fntmul(const mpd_uint_t *u, const mpd_uint_t *v, mpd_size_t ulen, mpd_size_t vlen, mpd_size_t *rsize);
-IMPORTEXPORT mpd_uint_t *_mpd_kmul(const mpd_uint_t *u, const mpd_uint_t *v, mpd_size_t ulen, mpd_size_t vlen, mpd_size_t *rsize);
-IMPORTEXPORT mpd_uint_t *_mpd_kmul_fnt(const mpd_uint_t *u, const mpd_uint_t *v, mpd_size_t ulen, mpd_size_t vlen, mpd_size_t *rsize);
+mpd_uint_t *_mpd_fntmul(const mpd_uint_t *u, const mpd_uint_t *v, mpd_size_t ulen, mpd_size_t vlen, mpd_size_t *rsize);
+mpd_uint_t *_mpd_kmul(const mpd_uint_t *u, const mpd_uint_t *v, mpd_size_t ulen, mpd_size_t vlen, mpd_size_t *rsize);
+mpd_uint_t *_mpd_kmul_fnt(const mpd_uint_t *u, const mpd_uint_t *v, mpd_size_t ulen, mpd_size_t vlen, mpd_size_t *rsize);
 
 
 #endif

Modified: python/branches/py3k-cdecimal/PCbuild/cdecimal.vcproj
==============================================================================
--- python/branches/py3k-cdecimal/PCbuild/cdecimal.vcproj	(original)
+++ python/branches/py3k-cdecimal/PCbuild/cdecimal.vcproj	Mon Nov  8 16:59:56 2010
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\Modules\cdecimal"
-				AdditionalOptions="/DCONFIG_32 /DPPRO /D_CRT_SECURE_NO_WARNINGS"
+				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -105,7 +105,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\Modules\cdecimal"
-				AdditionalOptions="/DCONFIG_64 /D_CRT_SECURE_NO_WARNINGS"
+				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\Modules\cdecimal"
-				AdditionalOptions="/DCONFIG_32 /DPPRO /D_CRT_SECURE_NO_WARNINGS"
+				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -231,7 +231,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\Modules\cdecimal"
-				AdditionalOptions="/DCONFIG_64 /D_CRT_SECURE_NO_WARNINGS"
+				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"


More information about the Python-checkins mailing list