From 47be4ab5001b31c7097749ec6d35d0c0a2f27b63 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 29 Apr 2011 19:49:39 -0700 Subject: [PATCH] * lisp.h (EMACS_INT, EMACS_UINT, BITS_PER_EMACS_INT, pI): Simplify. --- src/ChangeLog | 2 ++ src/lisp.h | 38 ++++++++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2b71a06ae4a..d75ec22b9f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-04-30 Paul Eggert + * 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. Reported by Stefan Monnier in . diff --git a/src/lisp.h b/src/lisp.h index 41848ebae8e..76938a49ac4 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -35,33 +35,23 @@ extern void check_cons_list (void); #endif /* These are default choices for the types to use. */ -#ifdef _LP64 #ifndef EMACS_INT -#define EMACS_INT long -#define BITS_PER_EMACS_INT BITS_PER_LONG -#define pI "l" -#endif -#ifndef EMACS_UINT -#define EMACS_UINT unsigned long -#endif -#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 -#define pI "" +# if BITS_PER_LONG < BITS_PER_LONG_LONG +# define EMACS_INT long long +# define BITS_PER_EMACS_INT BITS_PER_LONG_LONG +# define pI "ll" +# elif BITS_PER_INT < BITS_PER_LONG +# define EMACS_INT long +# define BITS_PER_EMACS_INT BITS_PER_LONG +# define pI "l" +# else +# define EMACS_INT int +# define BITS_PER_EMACS_INT BITS_PER_INT +# define pI "" +# endif #endif #ifndef EMACS_UINT -#define EMACS_UINT unsigned int -#endif +# define EMACS_UINT unsigned EMACS_INT #endif /* Extra internal type checking? */ -- 2.39.2