added optional button to restart game (door, panel and touch variants)

[rocksndiamonds.git] / src / libgame / hash.h

diff --git a/src/libgame/hash.h b/src/libgame/hash.h
index 90c5896c7263681783161adddf18c62122562308..f87f8b90e4e28ed00d0976cb418e436c69d0444f 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
-//                 http://www.artsoft.org/
+//                 https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // hash.h
 // ============================================================================
@@ -134,7 +134,7 @@ struct hashtable_itr
 struct hashtable *
 create_hashtable(unsigned int minsize, float maxloadfactor,
                  unsigned int (*hashfunction) (void*),
-                 int (*key_eq_fn) (void*,void*));
+                 int (*key_eq_fn) (void*, void*));
 
 /*****************************************************************************
  * hashtable_insert
@@ -159,9 +159,9 @@ int
 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,9 +178,9 @@ int
 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,9 +196,9 @@ void *
 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,9 +214,9 @@ void * /* returns value */
 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)); \
 }
 
 
@@ -249,13 +249,13 @@ struct hashtable_itr *
 hashtable_iterator(struct hashtable *h);
 
 /*****************************************************************************/
-/* key - return the key of the (key,value) pair at the current position */
+/* key - return the key of the (key, value) pair at the current position */
 
 void *
 hashtable_iterator_key(struct hashtable_itr *i);
 
 /*****************************************************************************/
-/* value - return the value of the (key,value) pair at the current position */
+/* value - return the value of the (key, value) pair at the current position */
 
 void *
 hashtable_iterator_value(struct hashtable_itr *i);