projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed sort priorities of special tree nodes to prevent bad sort results
[rocksndiamonds.git]
/
src
/
libgame
/
hash.h
diff --git
a/src/libgame/hash.h
b/src/libgame/hash.h
index 90c5896c7263681783161adddf18c62122562308..004d9c581183c5a5537583c37150eb6d673d3fa1 100644
(file)
--- a/
src/libgame/hash.h
+++ b/
src/libgame/hash.h
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// hash.h
// ============================================================================
// ----------------------------------------------------------------------------
// hash.h
// ============================================================================
@@
-159,7
+159,7
@@
int
hashtable_insert(struct hashtable *h, void *k, void *v);
#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \
hashtable_insert(struct hashtable *h, void *k, void *v);
#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \
-int fnname (struct hashtable *h, keytype *k, valuetype *v) \
+
static
int fnname (struct hashtable *h, keytype *k, valuetype *v) \
{ \
return hashtable_insert(h,k,v); \
}
{ \
return hashtable_insert(h,k,v); \
}
@@
-178,7
+178,7
@@
int
hashtable_change(struct hashtable *h, void *k, void *v);
#define DEFINE_HASHTABLE_CHANGE(fnname, keytype, valuetype) \
hashtable_change(struct hashtable *h, void *k, void *v);
#define DEFINE_HASHTABLE_CHANGE(fnname, keytype, valuetype) \
-int fnname (struct hashtable *h, keytype *k, valuetype *v) \
+
static
int fnname (struct hashtable *h, keytype *k, valuetype *v) \
{ \
return hashtable_change(h,k,v); \
}
{ \
return hashtable_change(h,k,v); \
}
@@
-196,7
+196,7
@@
void *
hashtable_search(struct hashtable *h, void *k);
#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \
hashtable_search(struct hashtable *h, void *k);
#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \
-valuetype * fnname (struct hashtable *h, keytype *k) \
+
static
valuetype * fnname (struct hashtable *h, keytype *k) \
{ \
return (valuetype *) (hashtable_search(h,k)); \
}
{ \
return (valuetype *) (hashtable_search(h,k)); \
}
@@
-214,7
+214,7
@@
void * /* returns value */
hashtable_remove(struct hashtable *h, void *k);
#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \
hashtable_remove(struct hashtable *h, void *k);
#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \
-valuetype * fnname (struct hashtable *h, keytype *k) \
+
static
valuetype * fnname (struct hashtable *h, keytype *k) \
{ \
return (valuetype *) (hashtable_remove(h,k)); \
}
{ \
return (valuetype *) (hashtable_remove(h,k)); \
}