aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-01 17:40:27 -0400
committerNick Mathewson <nickm@torproject.org>2012-11-01 17:40:27 -0400
commitae99fc1ccb91ff3f7f23962377a5ffe0d92ef9a1 (patch)
tree8364be54c1551ca504b889e5d6a1ad54a448c111 /src
parent9327a9f60777b3deb4f169f8a142164007ccb211 (diff)
downloadtor-ae99fc1ccb91ff3f7f23962377a5ffe0d92ef9a1.tar
tor-ae99fc1ccb91ff3f7f23962377a5ffe0d92ef9a1.tar.gz
Rename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilation
Apparently winnt.h defines a different SLIST_ENTRY of its own. Bug not in any version of Tor.
Diffstat (limited to 'src')
-rw-r--r--src/ext/tor_queue.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ext/tor_queue.h b/src/ext/tor_queue.h
index 622301d1c..98d6b9885 100644
--- a/src/ext/tor_queue.h
+++ b/src/ext/tor_queue.h
@@ -99,7 +99,9 @@ struct name { \
#define SLIST_HEAD_INITIALIZER(head) \
{ NULL }
-#define SLIST_ENTRY(type) \
+/* XXXX This macro name conflicts with a typedef in winnt.h, so Tor
+ * has to redefine it. */
+#define TOR_SLIST_ENTRY(type) \
struct { \
struct type *sle_next; /* next element */ \
}