From: Bruno Haible <bruno@clisp.org>
Date: Sun, 5 Jul 2020 19:42:14 +0000 (+0200)
Subject: Avoid possible future conflict with gnulib module 'hash'.
X-Git-Tag: v0.21~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e11edb9ab1ade8d4080f3670bcbae4111764f068;p=thirdparty%2Fgettext.git

Avoid possible future conflict with gnulib module 'hash'.

* gnulib-local/lib/hash.c.diff: New file.
* gnulib-local/lib/hash.h.diff: New file.
* gnulib-local/Makefile.am (EXTRA_DIST): Add them.
---

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index b04a50c60..a11bca21e 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -38,6 +38,8 @@ lib/getopt-core.h.diff \
 lib/gettext.h \
 lib/gl_array_list.h.diff \
 lib/gl_linkedhash_list.h.diff \
+lib/hash.c.diff \
+lib/hash.h.diff \
 lib/libxml/buf.c \
 lib/libxml/buf.h \
 lib/libxml/c14n.c \
diff --git a/gnulib-local/lib/hash.c.diff b/gnulib-local/lib/hash.c.diff
new file mode 100644
index 000000000..1379ebfe8
--- /dev/null
+++ b/gnulib-local/lib/hash.c.diff
@@ -0,0 +1,20 @@
+--- hash.c.orig	2020-07-04 10:21:00.491559357 +0200
++++ hash.c	2020-07-04 10:22:00.536240305 +0200
+@@ -390,6 +390,8 @@
+ 
+ /* Allocation and clean-up.  */
+ 
++#if 0
++
+ /* Return a hash index for a NUL-terminated STRING between 0 and N_BUCKETS-1.
+    This is a convenience routine for constructing other hashing functions.  */
+ 
+@@ -437,6 +439,8 @@
+ 
+ #endif /* not USE_DIFF_HASH */
+ 
++#endif
++
+ /* Return true if CANDIDATE is a prime number.  CANDIDATE should be an odd
+    number at least equal to 11.  */
+ 
diff --git a/gnulib-local/lib/hash.h.diff b/gnulib-local/lib/hash.h.diff
new file mode 100644
index 000000000..864464f3d
--- /dev/null
+++ b/gnulib-local/lib/hash.h.diff
@@ -0,0 +1,12 @@
+--- hash.h.orig	2020-07-04 10:20:48.099418874 +0200
++++ hash.h	2020-07-04 10:21:37.279976514 +0200
+@@ -66,7 +66,9 @@
+ size_t hash_do_for_each (const Hash_table *, Hash_processor, void *);
+ 
+ /* Allocation and clean-up.  */
++#if 0
+ size_t hash_string (const char *, size_t) _GL_ATTRIBUTE_PURE;
++#endif
+ void hash_reset_tuning (Hash_tuning *);
+ Hash_table *hash_initialize (size_t, const Hash_tuning *,
+                              Hash_hasher, Hash_comparator,