Avoid redefining simplehash_allocate/simplehash_free.

robertmhaas · robertmhaas · commit ac8eb972f268 · 2017-02-07T16:20:05.000-05:00
There's no generic guard against multiple inclusion in this file,
for good reason.  But these typedefs need one, as per a report
from Jeff Janes.
diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
@@ -88,8 +88,11 @@
 #define SH_ENTRY_HASH SH_MAKE_NAME(entry_hash)
 
 /* Allocation function for hash table elements */
+#ifndef SIMPLEHASH_TYPEDEFS
+#define SIMPLEHASH_TYPEDEFS
 typedef void *(*simplehash_allocate) (Size size, void *args);
 typedef void (*simplehash_free) (void *pointer, void *args);
+#endif
 
 /* generate forward declarations necessary to use the hash table */
 #ifdef SH_DECLARE
