Temporarily disable wider-than-pointer EMACS_INT.

2 files changed, 12 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index f1f34bb88b5..83d13ce77c6 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,6 +1,8 @@
-2011-05-05  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
-        * config.nt: Configure 64-bit integers for older compilers.
+        * config.nt: Prepare to configure 64-bit integers for older compilers.
+        However, temporarily disable this change unless the temporary
+        symbol WIDE_EMACS_INT is defined.
         (EMACS_INT, BITS_PER_EMACS_INT, pI): Define these if __int64 and
         "%I64d" work but long long and "%lld" do not.
 
diff --git a/nt/config.nt b/nt/config.nt
index b595e298996..55a8bccae19 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -480,11 +480,19 @@ extern char *getenv ();
 
 #elif _MSC_VER >= 1200
 
+/* Temporarily disable wider-than-pointer integers until they're tested more.
+   Build with CFLAGS='-DWIDE_EMACS_INT' to try them out.  */
+/* #undef WIDE_EMACS_INT */
+
+# ifdef WIDE_EMACS_INT
+
 /* Use pre-C99-style 64-bit integers.  */
 # define EMACS_INT __int64
 # define BITS_PER_EMACS_INT 64
 # define pI "I64"
 
+# endif
+
 #endif
 
 #ifndef POINTER_TYPE