fix various warnings reported by cparser

[libfirm] / ir / adt / cpset.c

diff --git a/ir/adt/cpset.c b/ir/adt/cpset.c
index e4c8716..5273068 100644 (file)
--- a/ir/adt/cpset.c
+++ b/ir/adt/cpset.c
@@ -1,5 +1,5 @@
 /*
- * Copyrigth (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -36,12 +36,15 @@
 #define ValueType                 void*
 #define NullValue                 NULL
 #define DeletedValue              ((void*)-1)
-#define Hash(this,value)          this->hash_function(value)
+#define Hash(this,key)            this->hash_function(key)
 #define KeysEqual(this,key1,key2) this->cmp_function(key1, key2)
+#define SCALAR_RETURN
 #define SetRangeEmpty(ptr,size)   memset(ptr, 0, (size) * sizeof(cpset_hashset_entry_t))
 
-#define hashset_init            _cpset_init
-#define hashset_init_size       _cpset_init_size
+void cpset_init_(cpset_t *self);
+#define hashset_init            cpset_init_
+void cpset_init_size_(cpset_t *self, size_t expected_elems);
+#define hashset_init_size       cpset_init_size_
 #define hashset_destroy         cpset_destroy
 #define hashset_insert          cpset_insert
 #define hashset_remove          cpset_remove
@@ -58,7 +61,7 @@ void cpset_init(cpset_t *this, cpset_hash_function hash_function,
 {
        this->hash_function = hash_function;
        this->cmp_function = cmp_function;
-       _cpset_init(this);
+       cpset_init_(this);
 }
 
 void cpset_init_size(cpset_t *this, cpset_hash_function hash_function,
@@ -66,5 +69,5 @@ void cpset_init_size(cpset_t *this, cpset_hash_function hash_function,
 {
        this->hash_function = hash_function;
        this->cmp_function = cmp_function;
-       _cpset_init_size(this, expected_elems);
+       cpset_init_size_(this, expected_elems);
 }