* lisp.h: Prefer 64-bit EMACS_INT if available.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index a1e048b1390f73b5341620f42fe128ef2cf37f1c..a9fc541b481c51d22ae0ac00c2508d03b9f8fc70 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-04-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * lisp.h: Prefer 64-bit EMACS_INT if available.
+       (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.
+
        * lread.c, process.c: Do not include <inttypes.h>; lisp.h does it now.
 
        Prefer intptr_t/uintptr_t for integers the same widths as pointers.

diff --git a/src/lisp.h b/src/lisp.h
index a8cf38f666916e3202d920f9fd5a5e81d64cee77..3b9778ddc6476afcdc615d40e4164bb50a14c060 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -44,7 +44,16 @@ extern void check_cons_list (void);
 #ifndef EMACS_UINT
 #define EMACS_UINT unsigned long
 #endif
-#else /* not _LP64 */
+#elif /* !_LP64 && */ BITS_PER_LONG < BITS_PER_LONG_LONG
+#ifndef EMACS_INT
+#define EMACS_INT long long
+#define BITS_PER_EMACS_INT BITS_PER_LONG_LONG
+#define pI "ll"
+#endif
+#ifndef EMACS_UINT
+#define EMACS_UINT unsigned long long
+#endif
+#else /* ! (_LP64 || BITS_PER_LONG < BITS_PER_LONG_LONG) */
 #ifndef EMACS_INT
 #define EMACS_INT int
 #define BITS_PER_EMACS_INT BITS_PER_INT