1998-09-21 03:22:07 +02:00
|
|
|
/* Hash tables for Objective C method dispatch.
|
2009-04-09 17:00:19 +02:00
|
|
|
Copyright (C) 1993, 1995, 1996, 2004, 2009 Free Software Foundation, Inc.
|
1998-09-21 03:22:07 +02:00
|
|
|
|
Makefile.in, [...]: Replace "GNU CC" with "GCC".
2003-05-23 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.in, NXConstStr.m, Object.m, Protocol.m, archive.c,
class.c, encoding.c, gc.c, objc/NXConstStr.h, objc/Object.h,
objc/Protocol.h, objc/encoding.h, objc/hash.h, objc/objc-api.h,
objc/objc-list.h, objc/objc.h, ocjc/runtime.h, objc/sarray.h,
objc/thr.h, objc/typedstream.h: Replace "GNU CC" with "GCC".
From-SVN: r67131
2003-05-23 22:04:58 +02:00
|
|
|
This file is part of GCC.
|
1998-09-21 03:22:07 +02:00
|
|
|
|
Makefile.in, [...]: Replace "GNU CC" with "GCC".
2003-05-23 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.in, NXConstStr.m, Object.m, Protocol.m, archive.c,
class.c, encoding.c, gc.c, objc/NXConstStr.h, objc/Object.h,
objc/Protocol.h, objc/encoding.h, objc/hash.h, objc/objc-api.h,
objc/objc-list.h, objc/objc.h, ocjc/runtime.h, objc/sarray.h,
objc/thr.h, objc/typedstream.h: Replace "GNU CC" with "GCC".
From-SVN: r67131
2003-05-23 22:04:58 +02:00
|
|
|
GCC is free software; you can redistribute it and/or modify
|
1998-09-21 03:22:07 +02:00
|
|
|
it under the terms of the GNU General Public License as published by
|
2009-04-09 17:00:19 +02:00
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
1998-09-21 03:22:07 +02:00
|
|
|
any later version.
|
|
|
|
|
Makefile.in, [...]: Replace "GNU CC" with "GCC".
2003-05-23 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.in, NXConstStr.m, Object.m, Protocol.m, archive.c,
class.c, encoding.c, gc.c, objc/NXConstStr.h, objc/Object.h,
objc/Protocol.h, objc/encoding.h, objc/hash.h, objc/objc-api.h,
objc/objc-list.h, objc/objc.h, ocjc/runtime.h, objc/sarray.h,
objc/thr.h, objc/typedstream.h: Replace "GNU CC" with "GCC".
From-SVN: r67131
2003-05-23 22:04:58 +02:00
|
|
|
GCC is distributed in the hope that it will be useful,
|
1998-09-21 03:22:07 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
2010-09-17 18:35:15 +02:00
|
|
|
/* You need to include this file after including objc.h */
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
#ifndef __hash_INCLUDE_GNU
|
|
|
|
#define __hash_INCLUDE_GNU
|
|
|
|
|
2004-08-14 00:23:58 +02:00
|
|
|
#include <stddef.h>
|
|
|
|
#include <string.h>
|
1998-09-21 03:22:07 +02:00
|
|
|
|
2004-06-25 06:31:51 +02:00
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
1998-09-21 03:22:07 +02:00
|
|
|
/*
|
|
|
|
* This data structure is used to hold items
|
|
|
|
* stored in a hash table. Each node holds
|
|
|
|
* a key/value pair.
|
|
|
|
*
|
|
|
|
* Items in the cache are really of type void *.
|
|
|
|
*/
|
|
|
|
typedef struct cache_node
|
|
|
|
{
|
|
|
|
struct cache_node *next; /* Pointer to next entry on the list.
|
|
|
|
NULL indicates end of list. */
|
|
|
|
const void *key; /* Key used to locate the value. Used
|
|
|
|
to locate value when more than one
|
|
|
|
key computes the same hash
|
|
|
|
value. */
|
|
|
|
void *value; /* Value stored for the key. */
|
|
|
|
} *node_ptr;
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This data type is the function that computes a hash code given a key.
|
|
|
|
* Therefore, the key can be a pointer to anything and the function specific
|
|
|
|
* to the key type.
|
|
|
|
*
|
|
|
|
* Unfortunately there is a mutual data structure reference problem with this
|
|
|
|
* typedef. Therefore, to remove compiler warnings the functions passed to
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
* objc_hash_new will have to be casted to this type.
|
1998-09-21 03:22:07 +02:00
|
|
|
*/
|
2002-07-02 21:43:03 +02:00
|
|
|
typedef unsigned int (*hash_func_type) (void *, const void *);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This data type is the function that compares two hash keys and returns an
|
|
|
|
* integer greater than, equal to, or less than 0, according as the first
|
|
|
|
* parameter is lexicographically greater than, equal to, or less than the
|
|
|
|
* second.
|
|
|
|
*/
|
|
|
|
|
2002-07-02 21:43:03 +02:00
|
|
|
typedef int (*compare_func_type) (const void *, const void *);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This data structure is the cache.
|
|
|
|
*
|
|
|
|
* It must be passed to all of the hashing routines
|
|
|
|
* (except for new).
|
|
|
|
*/
|
|
|
|
typedef struct cache
|
|
|
|
{
|
|
|
|
/* Variables used to implement the hash itself. */
|
|
|
|
node_ptr *node_table; /* Pointer to an array of hash nodes. */
|
|
|
|
/* Variables used to track the size of the hash table so to determine
|
|
|
|
when to resize it. */
|
|
|
|
unsigned int size; /* Number of buckets allocated for the hash table
|
|
|
|
(number of array entries allocated for
|
|
|
|
"node_table"). Must be a power of two. */
|
|
|
|
unsigned int used; /* Current number of entries in the hash table. */
|
|
|
|
unsigned int mask; /* Precomputed mask. */
|
|
|
|
|
|
|
|
/* Variables used to implement indexing through the hash table. */
|
|
|
|
|
|
|
|
unsigned int last_bucket; /* Tracks which entry in the array where
|
|
|
|
the last value was returned. */
|
|
|
|
/* Function used to compute a hash code given a key.
|
|
|
|
This function is specified when the hash table is created. */
|
|
|
|
hash_func_type hash_func;
|
|
|
|
/* Function used to compare two hash keys to see if they are equal. */
|
|
|
|
compare_func_type compare_func;
|
|
|
|
} *cache_ptr;
|
|
|
|
|
|
|
|
|
|
|
|
/* Allocate and initialize a hash table. */
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
cache_ptr objc_hash_new (unsigned int size,
|
|
|
|
hash_func_type hash_func,
|
|
|
|
compare_func_type compare_func);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Deallocate all of the hash nodes and the cache itself. */
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
void objc_hash_delete (cache_ptr cache);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Add the key/value pair to the hash table. If the
|
|
|
|
hash table reaches a level of fullness then it will be resized.
|
|
|
|
|
|
|
|
assert if the key is already in the hash. */
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
void objc_hash_add (cache_ptr *cachep, const void *key, void *value);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Remove the key/value pair from the hash table.
|
|
|
|
assert if the key isn't in the table. */
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
void objc_hash_remove (cache_ptr cache, const void *key);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Used to index through the hash table. Start with NULL
|
|
|
|
to get the first entry.
|
|
|
|
|
|
|
|
Successive calls pass the value returned previously.
|
|
|
|
** Don't modify the hash during this operation ***
|
|
|
|
|
|
|
|
Cache nodes are returned such that key or value can
|
|
|
|
be extracted. */
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
node_ptr objc_hash_next (cache_ptr cache, node_ptr node);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Used to return a value from a hash table using a given key. */
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
void *objc_hash_value_for_key (cache_ptr cache, const void *key);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/* Used to determine if the given key exists in the hash table */
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
BOOL objc_hash_is_key_in_hash (cache_ptr cache, const void *key);
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
/************************************************
|
|
|
|
|
|
|
|
Useful hashing functions.
|
|
|
|
|
|
|
|
Declared inline for your pleasure.
|
|
|
|
|
|
|
|
************************************************/
|
|
|
|
|
|
|
|
/* Calculate a hash code by performing some
|
|
|
|
manipulation of the key pointer. (Use the lowest bits
|
|
|
|
except for those likely to be 0 due to alignment.) */
|
|
|
|
|
|
|
|
static inline unsigned int
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_ptr (cache_ptr cache, const void *key)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
return ((size_t)key / sizeof (void *)) & cache->mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Calculate a hash code by iterating over a NULL
|
|
|
|
terminate string. */
|
|
|
|
static inline unsigned int
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_hash_string (cache_ptr cache, const void *key)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
unsigned int ret = 0;
|
|
|
|
unsigned int ctr = 0;
|
2004-03-05 22:06:57 +01:00
|
|
|
const char *ckey = (const char *) key;
|
1998-09-21 03:22:07 +02:00
|
|
|
|
2003-10-20 23:50:13 +02:00
|
|
|
while (*ckey) {
|
|
|
|
ret ^= *ckey++ << ctr;
|
1998-09-21 03:22:07 +02:00
|
|
|
ctr = (ctr + 1) % sizeof (void *);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret & cache->mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Compare two pointers for equality. */
|
|
|
|
static inline int
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_compare_ptrs (const void *k1, const void *k2)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
2003-04-11 06:30:33 +02:00
|
|
|
return (k1 == k2);
|
1998-09-21 03:22:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Compare two strings. */
|
|
|
|
static inline int
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
objc_compare_strings (const void *k1, const void *k2)
|
1998-09-21 03:22:07 +02:00
|
|
|
{
|
|
|
|
if (k1 == k2)
|
|
|
|
return 1;
|
|
|
|
else if (k1 == 0 || k2 == 0)
|
|
|
|
return 0;
|
|
|
|
else
|
2004-03-05 22:06:57 +01:00
|
|
|
return ! strcmp ((const char *) k1, (const char *) k2);
|
1998-09-21 03:22:07 +02:00
|
|
|
}
|
|
|
|
|
re PR libobjc/19024 (name collisions libobjc/libmysqlclient)
2005-03-02 David Ayers <d.ayers@inode.at>
PR libobjc/19024
* Makefile.in (OBJS): Add hash_compat.lo.
(OBJS_GC): Add hash_compat_gc.lo.
(hash_compat_gc.lo): New target and rule.
* objc/hash.h (hash_new, hash_delete, hash_add, hash_remove)
(hash_next, hash_value_for_key, hash_is_key_in_hash)
(hash_ptr, hash_string, compare_ptrs, compare_strings): Prefix
with objc_. Add deprecated non prefixed inlined versions.
(OBJC_IGNORE_DEPRECATED_API): New macro to hide deprecated
declarations.
* hash.c (hash_new, hash_delete, hash_add, hash_remove, hash_next)
(hash_value_for_key, hash_is_key_in_hash): Prefix with objc_ and
update callers.
* hash_compat.c: New file.
* archive.c: Update callers.
* init.c: Likewise.
* selector.c: Likewise.
* libobjc.def: Add objc_ versions of hash functions.
From-SVN: r95793
2005-03-02 20:37:03 +01:00
|
|
|
|
2004-06-25 06:31:51 +02:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
1998-09-21 03:22:07 +02:00
|
|
|
|
|
|
|
#endif /* not __hash_INCLUDE_GNU */
|