From: Bruno Haible <bruno@clisp.org>
Date: Sun, 18 Oct 2020 11:52:32 +0000 (+0200)
Subject: Update after gnulib changed.
X-Git-Tag: v0.21.1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db403c15ff04562a25c520cfe14e2e1f0e1435a2;p=thirdparty%2Fgettext.git

Update after gnulib changed.

* gnulib-local/lib/hash.h.diff: Update.
* gnulib-local/lib/hash.c.diff: Likewise.
---

diff --git a/gnulib-local/lib/hash.c.diff b/gnulib-local/lib/hash.c.diff
index 1379ebfe8..c2c731402 100644
--- a/gnulib-local/lib/hash.c.diff
+++ b/gnulib-local/lib/hash.c.diff
@@ -1,15 +1,15 @@
 --- 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 @@
+@@ -345,6 +345,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.  */
+ #if USE_DIFF_HASH
  
-@@ -437,6 +439,8 @@
+ /* About hashings, Paul Eggert writes to me (FP), on 1994-01-01: "Please see
+@@ -389,6 +391,8 @@
  
  #endif /* not USE_DIFF_HASH */
  
diff --git a/gnulib-local/lib/hash.h.diff b/gnulib-local/lib/hash.h.diff
index 864464f3d..4bc96900e 100644
--- a/gnulib-local/lib/hash.h.diff
+++ b/gnulib-local/lib/hash.h.diff
@@ -1,12 +1,18 @@
 --- 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 *);
+@@ -128,11 +128,15 @@
+  * Allocation and clean-up.
+  */
  
- /* Allocation and clean-up.  */
 +#if 0
- size_t hash_string (const char *, size_t) _GL_ATTRIBUTE_PURE;
++
+ /* 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.  */
+ extern size_t hash_string (const char *string, size_t n_buckets)
+        _GL_ATTRIBUTE_PURE;
+ 
 +#endif
- void hash_reset_tuning (Hash_tuning *);
- Hash_table *hash_initialize (size_t, const Hash_tuning *,
-                              Hash_hasher, Hash_comparator,
++
+ extern void hash_reset_tuning (Hash_tuning *tuning);
+ 
+ typedef size_t (*Hash_hasher) (const void *entry, size_t table_size);