Mercurial > emacs
changeset 96815:be932007d518
by renaming, get rid of need for hash_remove() redefinitions for NS platform; also, adjust nsgui dependencies in Makefile
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Sat, 19 Jul 2008 20:45:36 +0000 |
| parents | 2ae5159088f5 |
| children | 4de78b0389b4 |
| files | src/ChangeLog src/fns.c src/lisp.h src/nsgui.h |
| diffstat | 4 files changed, 10 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Jul 19 17:21:28 2008 +0000 +++ b/src/ChangeLog Sat Jul 19 20:45:36 2008 +0000 @@ -1,3 +1,11 @@ +2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com> + + * Makefile.in (nsgui.h-related dependencies): Remove abbrev, xfns, + xterm, xselect. + * lisp.h: Remove declaration of hash_remove. + * nsgui.h: Remove redefinitions of hash_remove. + * fns.c (hash_remove): Rename to hash_remove_from_table. + 2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com> * nsfont.m (nsfont_fmember_to_entity, nsfont_make_fontset_for_font):
--- a/src/fns.c Sat Jul 19 17:21:28 2008 +0000 +++ b/src/fns.c Sat Jul 19 20:45:36 2008 +0000 @@ -4205,7 +4205,7 @@ /* Remove the entry matching KEY from hash table H, if there is one. */ static void -hash_remove (h, key) +hash_remove_from_table (h, key) struct Lisp_Hash_Table *h; Lisp_Object key; { @@ -4866,7 +4866,7 @@ Lisp_Object key, table; { struct Lisp_Hash_Table *h = check_hash_table (table); - hash_remove (h, key); + hash_remove_from_table (h, key); return Qnil; }
--- a/src/lisp.h Sat Jul 19 17:21:28 2008 +0000 +++ b/src/lisp.h Sat Jul 19 20:45:36 2008 +0000 @@ -28,11 +28,6 @@ #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
--- a/src/nsgui.h Sat Jul 19 17:21:28 2008 +0000 +++ b/src/nsgui.h Sat Jul 19 20:45:36 2008 +0000 @@ -30,16 +30,8 @@ #undef init_process #endif /* NS_IMPL_COCOA */ -#ifdef NS_IMPL_GNUSTEP -#undef hash_remove -#endif - #import <AppKit/AppKit.h> -#ifdef NS_IMPL_GNUSTEP -#define hash_remove emacs_hash_remove -#endif - #ifdef NS_IMPL_COCOA #undef Cursor #define init_process emacs_init_process