# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1216500336 0
# Node ID be932007d518126fd47b0664ce823f3c9f84bcb3
# Parent  2ae5159088f5afa00897af99dc947e254273d11d
by renaming, get rid of need for hash_remove() redefinitions for NS platform; also, adjust nsgui dependencies in Makefile

diff -r 2ae5159088f5 -r be932007d518 src/ChangeLog
--- 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):
diff -r 2ae5159088f5 -r be932007d518 src/fns.c
--- 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;
 }
 
diff -r 2ae5159088f5 -r be932007d518 src/lisp.h
--- 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
diff -r 2ae5159088f5 -r be932007d518 src/nsgui.h
--- 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