From: Jim Meyering <jim@meyering.net>
Date: Tue, 17 Jun 2003 19:53:53 +0000 (+0000)
Subject: Merge in changes from gnulib.
X-Git-Tag: v5.0.1~244
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=8ccf7c033dc81b99ed1054dd94659afbdabfab35;p=thirdparty%2Fcoreutils.git

Merge in changes from gnulib.

Include <stdbool.h> unconditionally.
Include <limits.h>.
(CHAR_BIT): Don't define.
---

diff --git a/lib/hash.c b/lib/hash.c
index df8f4bd615..0bbe09596e 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,5 +1,8 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
+   Foundation, Inc.
+
    Written by Jim Meyering, 1992.
 
    This program is free software; you can redistribute it and/or modify
@@ -27,11 +30,9 @@
 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-typedef enum {false = 0, true = 1} bool;
-#endif
+
+#include <limits.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <assert.h>
 
@@ -403,9 +404,6 @@ hash_do_for_each (const Hash_table *table, Hash_processor processor,
 unsigned
 hash_string (const char *string, unsigned n_buckets)
 {
-# ifndef CHAR_BIT
-#  define CHAR_BIT 8
-# endif
 # define ROTATE_LEFT(Value, Shift) \
   ((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift)))
 # define HASH_ONE_CHAR(Value, Byte) \