* configure.in (BITS_PER_LONG_LONG): New macro.

2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a561f8efeec..31e8c869e52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.in (BITS_PER_LONG_LONG): New macro.
+
 2011-04-27  Ben Key  <bkey76@gmail.com>
 
         * configure.in: Fixed a bug that caused configure with
diff --git a/configure.in b/configure.in
index 68404bf0bcd..aadb6ebe84c 100644
--- a/configure.in
+++ b/configure.in
@@ -3518,7 +3518,8 @@ AH_BOTTOM([
 #endif
 
 /* These default definitions are good for almost all machines.
-   The exceptions override them in m/MACHINE.h.  */
+   Any exceptions should override them in m/MACHINE.h.
+   They must be usable in preprocessor conditionals.  */
 
 #ifndef BITS_PER_CHAR
 #define BITS_PER_CHAR 8
@@ -3528,9 +3529,6 @@ AH_BOTTOM([
 #define BITS_PER_SHORT 16
 #endif
 
-/* Note that lisp.h uses this in a preprocessor conditional, so it
-   would not work to use sizeof.  That being so, we do all of them
-   without sizeof, for uniformity's sake.  */
 #ifndef BITS_PER_INT
 #define BITS_PER_INT 32
 #endif
@@ -3543,6 +3541,10 @@ AH_BOTTOM([
 #endif
 #endif
 
+#if !defined BITS_PER_LONG_LONG && HAVE_LONG_LONG_INT
+#define BITS_PER_LONG_LONG 64
+#endif
+
 /* Define if the compiler supports function prototypes.  It may do so but
    not define __STDC__ (e.g. DEC C by default) or may define it as zero.  */
 #undef PROTOTYPES