diff options
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h index 5216b7a72f8..366a0be146d 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -28,6 +28,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 28 | #define P_(proto) () | 28 | #define P_(proto) () |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | #ifdef NS_IMPL_GNUSTEP | ||
| 32 | /* This conflicts with functions in the GNUstep libraries. */ | ||
| 33 | #define hash_remove emacs_hash_remove | ||
| 34 | #endif /* NS_IMPL_GNUSTEP */ | ||
| 35 | |||
| 31 | #if 0 | 36 | #if 0 |
| 32 | /* Define this temporarily to hunt a bug. If defined, the size of | 37 | /* Define this temporarily to hunt a bug. If defined, the size of |
| 33 | strings is redundantly recorded in sdata structures so that it can | 38 | strings is redundantly recorded in sdata structures so that it can |
| @@ -157,7 +162,7 @@ extern void die P_((const char *, const char *, int)) NO_RETURN; | |||
| 157 | #endif | 162 | #endif |
| 158 | 163 | ||
| 159 | /* Let's USE_LSB_TAG on systems where we know malloc returns mult-of-8. */ | 164 | /* Let's USE_LSB_TAG on systems where we know malloc returns mult-of-8. */ |
| 160 | #if defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ || defined MAC_OSX | 165 | #if defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ || defined MAC_OSX || defined(NS_IMPL_COCOA) |
| 161 | /* We also need to be able to specify mult-of-8 alignment on static vars. */ | 166 | /* We also need to be able to specify mult-of-8 alignment on static vars. */ |
| 162 | # if defined DECL_ALIGN | 167 | # if defined DECL_ALIGN |
| 163 | /* We currently do not support USE_LSB_TAG with a union Lisp_Object. */ | 168 | /* We currently do not support USE_LSB_TAG with a union Lisp_Object. */ |