Changeset 3140 for trunk/src/kmk/hash.h

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• hash.h (modified) (3 diffs)

trunk/src/kmk/hash.h

@@ -29 +29 @@
 # undef __P
 # define __P(protos)    ()
-/* We can get away without defining `const' here only because in this file
-   it is used only inside the prototype for `fnmatch', which is elided in
-   non-ANSI C where `const' is problematical.  */
+/* We can get away without defining 'const' here only because in this file
+   it is used only inside the prototype for 'fnmatch', which is elided in
+   non-ANSI C where 'const' is problematical.  */
 #endif /* C++ or ANSI C.  */
 
@@ -42 +42 @@
 {
   void **ht_vec;
+  hash_func_t ht_hash_1;        /* primary hash function */
+  hash_func_t ht_hash_2;        /* secondary hash function */
+  hash_cmp_func_t ht_compare;   /* comparison function */
   unsigned long ht_size;        /* total number of slots (power of 2) */
   unsigned long ht_capacity;    /* usable slots, limited by loading-factor */
@@ -49 +52 @@
   unsigned long ht_lookups;     /* # of queries */
   unsigned int ht_rehashes;     /* # of times we've expanded table */
-  hash_func_t ht_hash_1;        /* primary hash function */
-  hash_func_t ht_hash_2;        /* secondary hash function */
-  hash_cmp_func_t ht_compare;   /* comparison function */
 #ifdef CONFIG_WITH_STRCACHE2
   struct strcache2 *ht_strcache; /* the string cache pointer. */