fix travis

include/ua_util.h

@@ -7,17 +7,11 @@
 #include <stdlib.h> // malloc, free
 #include <string.h> // memcpy
 #include <assert.h> // assert
-#include <stddef.h> /* Needed for queue.h */
 
 #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>
 #endif
 
 #include "ua_types.h"

src/server/ua_securechannel_manager.h

@@ -1,6 +1,12 @@
 #ifndef UA_CHANNEL_MANAGER_H_
 #define UA_CHANNEL_MANAGER_H_
 
+#ifdef _WIN32
+# include "../deps/queue.h"
+#else
+# include <sys/queue.h>
+#endif
+
 #include "ua_server.h"
 #include "ua_securechannel.h"
 #include "ua_util.h"

src/server/ua_server_addressspace.c

@@ -1,17 +1,6 @@
 #include "ua_server.h"
 #include "ua_server_internal.h"
 
-    /* size_t i; */
-    /* for(i = 0;i<UA_TYPES_COUNT;i++) { */
-    /*     if(UA_TYPES_IDS[i] == typeId.identifier.numeric) */
-    /*         break; */
-    /* } */
-    /* if(i >= UA_TYPES_COUNT) { */
-    /*     UA_VariableNode_delete(tmpNode); */
-    /*     return UA_STATUSCODE_BADINTERNALERROR; */
-    /* } */
-    /* tmpNode->value.type = &UA_TYPES[i]; */
-
 UA_StatusCode UA_Server_addVariableNode(UA_Server *server, UA_Variant *value, UA_NodeId *nodeId,
                                         UA_QualifiedName *browseName, const UA_NodeId *parentNodeId,
                                         const UA_NodeId *referenceTypeId) {

src/server/ua_server_internal.h

@@ -9,6 +9,12 @@
 #include <urcu/wfcqueue.h>
 #endif
 
+#ifdef _WIN32
+# include "../deps/queue.h"
+#else
+# include <sys/queue.h>
+#endif
+
 #include "ua_server.h"
 #include "ua_session_manager.h"
 #include "ua_securechannel_manager.h"

src/server/ua_session_manager.h

@@ -1,6 +1,12 @@
 #ifndef UA_SESSION_MANAGER_H_
 #define UA_SESSION_MANAGER_H_
 
+#ifdef _WIN32
+# include "../deps/queue.h"
+#else
+# include <sys/queue.h>
+#endif
+
 #include "ua_server.h"
 #include "ua_util.h"
 #include "ua_session.h"