From ae99fc1ccb91ff3f7f23962377a5ffe0d92ef9a1 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 1 Nov 2012 17:40:27 -0400 Subject: 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. --- src/ext/tor_queue.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/ext') 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 */ \ } -- cgit v1.2.3