* lisp.h (WIDE_EMACS_INT): Now defaults to 1.

2 files changed, 7 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b81f66d8b6..490f5428e3a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * lisp.h (WIDE_EMACS_INT): Now defaults to 1.
+
         * xselect.c: Use 'unsigned' more consistently.
         (selection_data_to_lisp_data, lisp_data_to_selection_data):
         Use 'unsigned' consistently when computing sizes of unsigned objects.
diff --git a/src/lisp.h b/src/lisp.h
index 37687f884d5..e694bbcc58e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -36,13 +36,14 @@ 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 */
+/* To disable wider-than-pointer integers, build with -DWIDE_EMACS_INT=0.  */
+#ifndef WIDE_EMACS_INT
+#define WIDE_EMACS_INT 1
+#endif
 
 /* These are default choices for the types to use.  */
 #ifndef EMACS_INT
-# if BITS_PER_LONG < BITS_PER_LONG_LONG && defined WIDE_EMACS_INT
+# if BITS_PER_LONG < BITS_PER_LONG_LONG && WIDE_EMACS_INT
 #  define EMACS_INT long long
 #  define BITS_PER_EMACS_INT BITS_PER_LONG_LONG
 #  define pI "ll"