-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.
#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
(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.
#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"