* verify.cc (_Jv_BytecodeVerifier::check_field_constant): Handle

[pf3gnuchains/gcc-fork.git] / gcc / hash.h

diff --git a/gcc/hash.h b/gcc/hash.h
index d79bc08..bd75f94 100644 (file)
--- a/gcc/hash.h
+++ b/gcc/hash.h
@@ -25,12 +25,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "obstack.h"
 
-#undef false
-#undef true
-#undef boolean
-
-typedef enum {false, true} boolean;
-
 typedef PTR hash_table_key;
 
 /* Hash table routines.  There is no way to free up a hash table.  */
@@ -70,7 +64,7 @@ struct hash_table
   /* A function to compute the hash code for a key in the hash table.  */
   unsigned long (*hash) PARAMS ((hash_table_key));
   /* A function to compare two keys.  */
-  boolean (*comp) PARAMS ((hash_table_key, hash_table_key));
+  bool (*comp) PARAMS ((hash_table_key, hash_table_key));
   /* An obstack for this hash table.  */
   struct obstack memory;
 };
@@ -82,7 +76,7 @@ extern void hash_table_init
                                   struct hash_table *,
                                   hash_table_key),
           unsigned long (*hash) (hash_table_key),
-          boolean (*comp) (hash_table_key, hash_table_key)));
+          bool (*comp) (hash_table_key, hash_table_key)));
 
 /* Initialize a hash table specifying a size.  */
 extern void hash_table_init_n
@@ -91,7 +85,7 @@ extern void hash_table_init_n
                                   struct hash_table *,
                                   hash_table_key),
           unsigned long (*hash) (hash_table_key),
-          boolean (*comp) (hash_table_key, hash_table_key),
+          bool (*comp) (hash_table_key, hash_table_key),
           unsigned int size));
 
 /* Free up a hash table.  */
@@ -102,7 +96,7 @@ extern void hash_table_free PARAMS ((struct hash_table *));
    COPY is non-NULL, it is used to copy the KEY before storing it in
    the hash table.  */
 extern struct hash_entry *hash_lookup
-  PARAMS ((struct hash_table *, hash_table_key key, boolean create,
+  PARAMS ((struct hash_table *, hash_table_key key, int create,
           hash_table_key (*copy)(struct obstack*, hash_table_key)));
 
 /* Base method for creating a hash table entry.  */
@@ -118,7 +112,7 @@ extern PTR hash_allocate PARAMS ((struct hash_table *,
    element.  If the function returns false, the traversal stops.  The
    INFO argument is passed to the function.  */
 extern void hash_traverse PARAMS ((struct hash_table *,
-                                  boolean (*) (struct hash_entry *,
+                                  bool (*) (struct hash_entry *,
                                                hash_table_key),
                                   hash_table_key info));
 
@@ -126,7 +120,7 @@ extern void hash_traverse PARAMS ((struct hash_table *,
 extern unsigned long string_hash PARAMS ((hash_table_key k));
 
 /* Compare two strings K1, K2 which are really of type `char*'.  */
-extern boolean string_compare PARAMS ((hash_table_key k1, 
+extern bool string_compare PARAMS ((hash_table_key k1, 
                                       hash_table_key k2));
 
 /* Copy a string K, which is really of type `char*'.  */