From ac8eb972f268c787bfe7579b1747c3866fced5a9 Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Tue, 7 Feb 2017 16:20:05 -0500
Subject: [PATCH] Avoid redefining simplehash_allocate/simplehash_free.

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.
---
 src/include/lib/simplehash.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
index fd7063c216f..359c7b8aa0c 100644
--- 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
-- 
GitLab