Commit 5a2d7ab6 authored by Adrian Robert's avatar Adrian Robert
Browse files

by renaming, get rid of need for hash_remove() redefinitions for NS platform;...

by renaming, get rid of need for hash_remove() redefinitions for NS platform; also, adjust nsgui dependencies in Makefile
parent c469837a
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):
......
......@@ -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;
}
......
......@@ -28,11 +28,6 @@ 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
......
......@@ -30,16 +30,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment