Browse Source

Rename queue.h to avoid name collision with bsd OS

Stefan Profanter 5 years ago
parent
commit
18e3d5a6d7

+ 1 - 1
CMakeLists.txt

@@ -497,7 +497,7 @@ set(exported_headers ${exported_headers}
                      ${PROJECT_SOURCE_DIR}/include/ua_client_subscriptions.h
                      ${PROJECT_SOURCE_DIR}/include/ua_client_highlevel_async.h)
 
-set(internal_headers ${PROJECT_SOURCE_DIR}/deps/queue.h
+set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
                      ${PROJECT_SOURCE_DIR}/deps/libc_time.h
                      ${PROJECT_SOURCE_DIR}/deps/base64.h

deps/queue.h → deps/open62541_queue.h


+ 1 - 1
src/client/ua_client_internal.h

@@ -20,7 +20,7 @@
 #include "ua_client_highlevel.h"
 #include "ua_client_subscriptions.h"
 #include "ua_timer.h"
-#include "../../deps/queue.h"
+#include "open62541_queue.h"
 
 _UA_BEGIN_DECLS
 

+ 1 - 1
src/pubsub/ua_pubsub.h

@@ -12,7 +12,7 @@
 #include "ua_pubsub_networkmessage.h"
 #include "ua_server.h"
 #include "ua_server_pubsub.h"
-#include "../deps/queue.h"
+#include "open62541_queue.h"
 
 _UA_BEGIN_DECLS
 

+ 1 - 1
src/server/ua_discovery_manager.h

@@ -15,7 +15,7 @@
 #define UA_DISCOVERY_MANAGER_H_
 
 #include "ua_server.h"
-#include "../deps/queue.h"
+#include "open62541_queue.h"
 
 _UA_BEGIN_DECLS
 

+ 1 - 1
src/server/ua_securechannel_manager.h

@@ -15,7 +15,7 @@
 #include "ua_server.h"
 #include "ua_workqueue.h"
 #include "ua_securechannel.h"
-#include "../../deps/queue.h"
+#include "open62541_queue.h"
 
 _UA_BEGIN_DECLS
 

+ 1 - 1
src/server/ua_session_manager.h

@@ -16,7 +16,7 @@
 #include "ua_workqueue.h"
 #include "ua_util_internal.h"
 #include "ua_session.h"
-#include "../../deps/queue.h"
+#include "open62541_queue.h"
 
 _UA_BEGIN_DECLS
 

+ 1 - 1
src/ua_securechannel.h

@@ -16,7 +16,7 @@
 #include "ua_connection_internal.h"
 #include "ua_plugin_securitypolicy.h"
 #include "ua_plugin_log.h"
-#include "../deps/queue.h"
+#include "open62541_queue.h"
 
 _UA_BEGIN_DECLS
 

+ 1 - 1
src/ua_workqueue.h

@@ -18,7 +18,7 @@
 #define UA_WORKQUEUE_H_
 
 #include "ua_util_internal.h"
-#include "../../deps/queue.h"
+#include "open62541_queue.h"
 
 #ifdef UA_ENABLE_MULTITHREADING
 #include <pthread.h>