diff options
| author | Kenichi Handa <handa@gnu.org> | 2013-04-27 22:34:02 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2013-04-27 22:34:02 +0900 |
| commit | 13d0e56fa3f73d3583b39409d98aefc30ea52daa (patch) | |
| tree | 2ac0129ee112a3c2a662d25db50d5ca0afb8a672 /src | |
| parent | 8bd722db81bcb303d6945b800c7ccb615a5474a5 (diff) | |
| parent | 8beecaeda0d28bff0c4d3c2758bb938c656728b5 (diff) | |
| download | emacs-13d0e56fa3f73d3583b39409d98aefc30ea52daa.tar.gz | |
merge trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lisp.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5dd113775d9..d649c1bcdbc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,11 @@ * font.c (font_open_entity): Always open a font of manageable size. +2013-04-26 Paul Eggert <eggert@cs.ucla.edu> + Port better to AIX (Bug#14258). + * lisp.h (ENUM_BF) [__IBMC__]: Make it 'unsigned int' here, too, + to pacify AIX xlc. + 2013-04-24 Kenichi Handa <handa@gnu.org> * coding.c (decode_coding_iso_2022): When an invalid escape diff --git a/src/lisp.h b/src/lisp.h index bcb866b4cc4..e2c24eed352 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -231,9 +231,9 @@ enum enum_USE_LSB_TAG { USE_LSB_TAG = 0 }; #define case_Lisp_Int case Lisp_Int0: case Lisp_Int1 #define LISP_INT_TAG_P(x) (((x) & ~Lisp_Int1) == 0) -/* Stolen from GDB. The only known compiler that doesn't support - enums in bitfields is MSVC. */ -#ifdef _MSC_VER +/* Idea stolen from GDB. MSVC doesn't support enums in bitfields, + and xlc complains vociferously about them. */ +#if defined _MSC_VER || defined __IBMC__ #define ENUM_BF(TYPE) unsigned int #else #define ENUM_BF(TYPE) enum TYPE |