X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fcpset.c;h=0edffd7f67cc1e3fc4daf6b3c8648c89a879826d;hb=e775a978fff2841e0722c47f13545b54d48b8f98;hp=f5a0a26b3b81943b843c6bb581248ff1ba05ba17;hpb=974215da1a935f250766874d0f7a7ddfa34bc4ef;p=libfirm

diff --git a/ir/adt/cpset.c b/ir/adt/cpset.c
index f5a0a26b3..0edffd7f6 100644
--- a/ir/adt/cpset.c
+++ b/ir/adt/cpset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (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.
  *
@@ -24,7 +24,7 @@
  * @version $Id$
  *
  * This implements a set of pointers which allows to specify custom callbacks
- * for comparing and hashing it's elements.
+ * for comparing and hashing its elements.
  */
 #include "config.h"
 
@@ -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
@@ -53,18 +56,18 @@
 
 #include "hashset.c"
 
-void cpset_init(cpset_t *this, cpset_hash_function hash_function,
+void cpset_init(cpset_t *this_, cpset_hash_function hash_function,
                 cpset_cmp_function cmp_function)
 {
-	this->hash_function = hash_function;
-	this->cmp_function = cmp_function;
-	_cpset_init(this);
+	this_->hash_function = hash_function;
+	this_->cmp_function = cmp_function;
+	cpset_init_(this_);
 }
 
-void cpset_init_size(cpset_t *this, cpset_hash_function hash_function,
+void cpset_init_size(cpset_t *this_, cpset_hash_function hash_function,
                      cpset_cmp_function cmp_function, size_t expected_elems)
 {
-	this->hash_function = hash_function;
-	this->cmp_function = cmp_function;
-	_cpset_init_size(this, expected_elems);
+	this_->hash_function = hash_function;
+	this_->cmp_function = cmp_function;
+	cpset_init_size_(this_, expected_elems);
 }