Commit 47be4ab5 authored by Paul Eggert's avatar Paul Eggert
Browse files

* lisp.h (EMACS_INT, EMACS_UINT, BITS_PER_EMACS_INT, pI): Simplify.

parent 371cac43
2011-04-30 Paul Eggert <eggert@cs.ucla.edu> 2011-04-30 Paul Eggert <eggert@cs.ucla.edu>
* lisp.h (EMACS_INT, EMACS_UINT, BITS_PER_EMACS_INT, pI): Simplify.
* dbusbind.c: Do not use XPNTR on a value that may be an integer. * dbusbind.c: Do not use XPNTR on a value that may be an integer.
Reported by Stefan Monnier in Reported by Stefan Monnier in
<http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00919.html>. <http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00919.html>.
......
...@@ -35,33 +35,23 @@ extern void check_cons_list (void); ...@@ -35,33 +35,23 @@ extern void check_cons_list (void);
#endif #endif
/* These are default choices for the types to use. */ /* These are default choices for the types to use. */
#ifdef _LP64
#ifndef EMACS_INT #ifndef EMACS_INT
#define EMACS_INT long # if BITS_PER_LONG < BITS_PER_LONG_LONG
#define BITS_PER_EMACS_INT BITS_PER_LONG # define EMACS_INT long long
#define pI "l" # define BITS_PER_EMACS_INT BITS_PER_LONG_LONG
#endif # define pI "ll"
#ifndef EMACS_UINT # elif BITS_PER_INT < BITS_PER_LONG
#define EMACS_UINT unsigned long # define EMACS_INT long
#endif # define BITS_PER_EMACS_INT BITS_PER_LONG
#elif /* !_LP64 && */ BITS_PER_LONG < BITS_PER_LONG_LONG # define pI "l"
#ifndef EMACS_INT # else
#define EMACS_INT long long # define EMACS_INT int
#define BITS_PER_EMACS_INT BITS_PER_LONG_LONG # define BITS_PER_EMACS_INT BITS_PER_INT
#define pI "ll" # define pI ""
#endif # 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
#define pI ""
#endif #endif
#ifndef EMACS_UINT #ifndef EMACS_UINT
#define EMACS_UINT unsigned int # define EMACS_UINT unsigned EMACS_INT
#endif
#endif #endif
/* Extra internal type checking? */ /* Extra internal type checking? */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment