From 5a2d7ab6bfca5ded38c0d5c70e92c3b4f19660d9 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Sat, 19 Jul 2008 20:45:36 +0000 Subject: [PATCH] by renaming, get rid of need for hash_remove() redefinitions for NS platform; also, adjust nsgui dependencies in Makefile --- src/ChangeLog | 8 ++++++++ src/fns.c | 4 ++-- src/lisp.h | 5 ----- src/nsgui.h | 8 -------- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d395861dfa1..dd015342bc9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-07-19 Adrian Robert + + * 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 * nsfont.m (nsfont_fmember_to_entity, nsfont_make_fontset_for_font): diff --git a/src/fns.c b/src/fns.c index 72f1c93fd29..4614ba130cb 100644 --- a/src/fns.c +++ b/src/fns.c @@ -4205,7 +4205,7 @@ hash_put (h, key, value, hash) /* 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 @@ DEFUN ("remhash", Fremhash, Sremhash, 2, 2, 0, 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; } diff --git a/src/lisp.h b/src/lisp.h index 58fef2efff0..340a0352b6d 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -28,11 +28,6 @@ along with GNU Emacs. If not, see . */ #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 diff --git a/src/nsgui.h b/src/nsgui.h index 90dbef6a06a..91b2956bf3f 100644 --- a/src/nsgui.h +++ b/src/nsgui.h @@ -30,16 +30,8 @@ along with GNU Emacs. If not, see . */ #undef init_process #endif /* NS_IMPL_COCOA */ -#ifdef NS_IMPL_GNUSTEP -#undef hash_remove -#endif - #import -#ifdef NS_IMPL_GNUSTEP -#define hash_remove emacs_hash_remove -#endif - #ifdef NS_IMPL_COCOA #undef Cursor #define init_process emacs_init_process -- 2.39.2