summaryrefslogtreecommitdiff
path: root/ht-internal.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-02-13 17:59:14 -0500
committerNick Mathewson <nickm@torproject.org>2012-02-13 17:59:14 -0500
commit46e5bb7bdcda97b0f6730a6ad00eb8ebb90a5aab (patch)
tree5ae1ef71657c07ce1717decd513b764709f2ea3b /ht-internal.h
parent6c81be746cca7f49beeb2801ecbd2c5489674832 (diff)
downloadlibevent-46e5bb7bdcda97b0f6730a6ad00eb8ebb90a5aab.tar.gz
Invert the sense and the name of HT_CACHE_HASH_VALUES
This is meant to make it easier to merge ht-internal.h back upstream into Tor.
Diffstat (limited to 'ht-internal.h')
-rw-r--r--ht-internal.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ht-internal.h b/ht-internal.h
index 46738251..e9070f85 100644
--- a/ht-internal.h
+++ b/ht-internal.h
@@ -25,16 +25,16 @@
#define HT_INITIALIZER() \
{ NULL, 0, 0, 0, -1 }
-#ifdef HT_CACHE_HASH_VALUES
+#ifdef HT_NO_CACHE_HASH_VALUES
#define HT_ENTRY(type) \
struct { \
struct type *hte_next; \
- unsigned hte_hash; \
}
#else
#define HT_ENTRY(type) \
struct { \
struct type *hte_next; \
+ unsigned hte_hash; \
}
#endif
@@ -97,7 +97,7 @@ ht_string_hash(const char *s)
return h;
}
-#ifdef HT_CACHE_HASH_VALUES
+#ifndef HT_NO_CACHE_HASH_VALUES
#define _HT_SET_HASH(elm, field, hashfn) \
do { (elm)->field.hte_hash = hashfn(elm); } while (0)
#define _HT_SET_HASHVAL(elm, field, val) \