2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 755b02631f6..80baa5d131a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -55,6 +55,8 @@
         (EMACS_INT, EMACS_UINT, BITS_PER_EMACS_INT, pI): Define to 64-bit
         on 32-bit hosts that have 64-bit int, so that they can access
         large files.
+        However, temporarily disable this change unless the temporary
+        symbol WIDE_EMACS_INT is defined.
 
         * lread.c, process.c: Do not include <inttypes.h>; lisp.h does it now.
 
diff --git a/src/lisp.h b/src/lisp.h
index bb3a8cc393c..66f5c962be8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -34,9 +34,13 @@ extern void check_cons_list (void);
 #define CHECK_CONS_LIST() ((void) 0)
 #endif
 
+/* 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 */
+
 /* These are default choices for the types to use.  */
 #ifndef EMACS_INT
-# if BITS_PER_LONG < BITS_PER_LONG_LONG
+# if BITS_PER_LONG < BITS_PER_LONG_LONG && defined WIDE_EMACS_INT
 #  define EMACS_INT long long
 #  define BITS_PER_EMACS_INT BITS_PER_LONG_LONG
 #  define pI "ll"