remove Windows issue with VERSION definition

wbhart · Apr 10, 2010 · d54226b · d54226b
1 parent 4abb8c8
commit d54226b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/gmp-h.in b/gmp-h.in
@@ -2381,7 +2381,7 @@ enum
 #define __MPIR_VERSION_MINOR 0
 #define __MPIR_VERSION_PATCHLEVEL 0
 #if defined( _MSC_VER )
-#define VERSION "2.0.0"
+#define _MSC_MPIR_VERSION "2.0.0"
 #endif
 
 /* These are for programs like MPFR to use the same CC and CFLAGS as MPIR */

diff --git a/setversion b/setversion
@@ -42,7 +42,7 @@ cat gmp-h.in \
 | sed s/"#define[[:space:]]\+__MPIR_VERSION[[:space:]]\+.*"/"#define __MPIR_VERSION "$VERSION/ \
 | sed s/"#define[[:space:]]\+__MPIR_VERSION_MINOR[[:space:]]\+.*"/"#define __MPIR_VERSION_MINOR "$VERSION_MINOR/ \
 | sed s/"#define[[:space:]]\+__MPIR_VERSION_PATCHLEVEL[[:space:]]\+.*"/"#define __MPIR_VERSION_PATCHLEVEL "$VERSION_PATCHLEVEL/ \
-| sed s/"#define[[:space:]]\+VERSION[[:space:]]\+.*"/"#define VERSION "\"$VERSION_STR\"/ > $TMPFILE
+| sed s/"#define[[:space:]]\+VERSION[[:space:]]\+.*"/"#define _MSC_MPIR_VERSION "\"$VERSION_STR\"/ > $TMPFILE
 mv $TMPFILE gmp-h.in
 
 #update build.vc9/config.*

diff --git a/version.c b/version.c
@@ -25,4 +25,8 @@ MA 02110-1301, USA. */
 #include "gmp-impl.h"
 
 const char * const gmp_version = GMP_VERSION;
+#if defined( _MSC_VER )
+const char * const mpir_version = _MSC_MPIR_VERSION;
+#else
 const char * const mpir_version = VERSION;
+#endif