From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 2 Jun 2011 06:29:14 +0000 (-0700)
Subject: * lisp.h (WIDE_EMACS_INT): Now defaults to 1.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~8^2~11^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47de45b793c19b81914434b12476d3e6b5e9342e;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d84500e78d..3f5d9e19c1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* lisp.h (WIDE_EMACS_INT): Now defaults to 1.
+
 	* fileio.c (Fverify_visited_file_modtime): Avoid time overflow
 	if b->modtime has its maximal value.
 
diff --git a/src/lisp.h b/src/lisp.h
index 6ef2c4211f2..7f3f76a8e1e 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"