diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
| commit | 44fbaf8dbf48607a410eb71044934b90b84d9f23 (patch) | |
| tree | 7d4ed52d5d577cd447fb5134be07fde184f493f4 /src/lisp.h | |
| parent | 691e329080abb159f73cef723912a41e0169c6d8 (diff) | |
| download | emacs-44fbaf8dbf48607a410eb71044934b90b84d9f23.tar.gz | |
merging Emacs.app (NeXTstep port)
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/>. */ #define P_(proto) () #endif +#ifdef NS_IMPL_GNUSTEP +/* This conflicts with functions in the GNUstep libraries. */ +#define hash_remove emacs_hash_remove +#endif /* NS_IMPL_GNUSTEP */ + #if 0 /* Define this temporarily to hunt a bug. If defined, the size of 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; #endif /* Let's USE_LSB_TAG on systems where we know malloc returns mult-of-8. */ -#if defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ || defined MAC_OSX +#if defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ || defined MAC_OSX || defined(NS_IMPL_COCOA) /* We also need to be able to specify mult-of-8 alignment on static vars. */ # if defined DECL_ALIGN /* We currently do not support USE_LSB_TAG with a union Lisp_Object. */ |