Pārlūkot izejas kodu

reset queue.h to the original state and do the undef SLIST_ENTRY outside

Julius Pfrommer 9 gadi atpakaļ
vecāks
revīzija
a603409a5e
2 mainītis faili ar 3 papildinājumiem un 7 dzēšanām
  1. 0 7
      deps/queue.h
  2. 3 0
      include/ua_util.h

+ 0 - 7
deps/queue.h

@@ -99,13 +99,6 @@ struct name {								\
 #define	SLIST_HEAD_INITIALIZER(head)					\
 	{ NULL }
  
-
-/*changes by Stasik0 to avoid conflicts with winnt.h*/
-#ifdef SLIST_ENTRY
-#undef SLIST_ENTRY
-#endif
-/**/
-
 #define SLIST_ENTRY(type)						\
 struct {								\
 	struct type *sle_next;	/* next element */			\

+ 3 - 0
include/ua_util.h

@@ -12,6 +12,9 @@
 #ifdef _WIN32
 # include <malloc.h>
 # include "../deps/queue.h"
+# ifdef SLIST_ENTRY
+#  undef SLIST_ENTRY // avoid a conflik in winnt.h
+# endif
 #else
 # include <alloca.h>
 # include <sys/queue.h>