From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Nov 2012 21:40:27 +0000 (-0400)
Subject: Rename SLIST_ENTRY to TOR_SLIST_ENTRY to fix windows compilation
X-Git-Tag: tor-0.2.4.6-alpha~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae99fc1ccb91ff3f7f23962377a5ffe0d92ef9a1;p=thirdparty%2Ftor.git

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.
---

diff --git a/src/ext/tor_queue.h b/src/ext/tor_queue.h
index 622301d1ca..98d6b98858 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 */			\
 }