@@ -50,18 +50,18 @@
 {
 	struct objc_hashtable *h;
 	uint32_t i;
 
 	if ((h = malloc(sizeof(struct objc_hashtable))) == NULL)
-		ERROR("Not enough memory to allocate hash table!");
+		OBJC_ERROR("Not enough memory to allocate hash table!");
 
 	h->count = 0;
 	h->last_idx = size - 1;
 	h->data = malloc(size * sizeof(struct objc_hashtable_bucket*));
 
 	if (h->data == NULL)
-		ERROR("Not enough memory to allocate hash table!");
+		OBJC_ERROR("Not enough memory to allocate hash table!");
 
 	for (i = 0; i < size; i++)
 		h->data[i] = NULL;
 
 	return h;
@@ -82,11 +82,12 @@
 
 		assert(nsize > 0);
 
 		ndata = malloc(nsize * sizeof(struct objc_hashtable_bucket*));
 		if (ndata == NULL)
-			ERROR("Not enough memory to insert into hash table!");
+			OBJC_ERROR("Not enough memory to insert into hash "
+			    "table!");
 
 		for (i = 0; i < nsize; i++)
 			ndata[i] = NULL;
 
 		for (i = 0; i <= h->last_idx; i++) {
@@ -104,11 +105,11 @@
 					for (j = 0; j < last &&
 					    ndata[j] != NULL; j++);
 				}
 
 				if (j >= last)
-					ERROR("No free bucket!");
+					OBJC_ERROR("No free bucket!");
 
 				ndata[j] = h->data[i];
 			}
 		}
 
@@ -126,14 +127,14 @@
 
 		for (i = 0; i < last && h->data[i] != NULL; i++);
 	}
 
 	if (i >= last)
-		ERROR("No free bucket!");
+		OBJC_ERROR("No free bucket!");
 
 	if ((bucket = malloc(sizeof(struct objc_hashtable_bucket))) == NULL)
-		ERROR("Not enough memory to allocate hash table bucket!");
+		OBJC_ERROR("Not enough memory to allocate hash table bucket!");
 
 	bucket->key = key;
 	bucket->hash = hash;
 	bucket->obj = obj;