diff options
| author | Eli Zaretskii | 2013-05-01 20:47:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-05-01 20:47:50 +0300 |
| commit | b1cb82edff21abfefd68af18370dddfd8cc1fec0 (patch) | |
| tree | fd8d8a1e1d99af024b52158a471457fc796238bc /src/lisp.h | |
| parent | 10f81f3ac90f98160f611787e20dcad96bb500e9 (diff) | |
| parent | 2640d52e4e7873e41b0f0f1144177f84c345917e (diff) | |
| download | emacs-b1cb82edff21abfefd68af18370dddfd8cc1fec0.tar.gz emacs-b1cb82edff21abfefd68af18370dddfd8cc1fec0.zip | |
Merge from trunk.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 }; | |||
| 231 | #define case_Lisp_Int case Lisp_Int0: case Lisp_Int1 | 231 | #define case_Lisp_Int case Lisp_Int0: case Lisp_Int1 |
| 232 | #define LISP_INT_TAG_P(x) (((x) & ~Lisp_Int1) == 0) | 232 | #define LISP_INT_TAG_P(x) (((x) & ~Lisp_Int1) == 0) |
| 233 | 233 | ||
| 234 | /* Stolen from GDB. The only known compiler that doesn't support | 234 | /* Idea stolen from GDB. MSVC doesn't support enums in bitfields, |
| 235 | enums in bitfields is MSVC. */ | 235 | and xlc complains vociferously about them. */ |
| 236 | #ifdef _MSC_VER | 236 | #if defined _MSC_VER || defined __IBMC__ |
| 237 | #define ENUM_BF(TYPE) unsigned int | 237 | #define ENUM_BF(TYPE) unsigned int |
| 238 | #else | 238 | #else |
| 239 | #define ENUM_BF(TYPE) enum TYPE | 239 | #define ENUM_BF(TYPE) enum TYPE |