Procházet zdrojové kódy

Stack: Do not use relative includes. Preparation for packaging

Stefan Profanter před 5 roky
rodič
revize
b2f29fa33d

+ 1 - 1
arch/Readme.md

@@ -99,7 +99,7 @@
     * Do the same for UA_LOG_SOCKET_ERRNO_GAI_WRAP(LOG) for errors related to getaddrinfo
     */
     
-    #include "../ua_architecture_functions.h"
+    #include "ua_architecture_functions.h"
     
     #endif /* PLUGINS_ARCH_NEW_ARCH_UA_ARCHITECTURE_H_ */
     

arch/common/freeRTOS62541.h → arch/common/ua_freeRTOS.h


arch/common/lwip62541.h → arch/common/ua_lwip.h


+ 1 - 1
arch/eCos/ua_architecture.h

@@ -82,7 +82,7 @@ int gethostname_ecos(char* name, size_t len);
     LOG; \
 }
 
-#include "../ua_architecture_functions.h"
+#include "ua_architecture_functions.h"
 
 #endif /* PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_ */
 

+ 3 - 3
arch/freertosLWIP/CMakeLists.txt

@@ -14,8 +14,8 @@ if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "freertosLWIP")
         if(UA_ARCH_FREERTOS_USE_OWN_MEMORY_FUNCTIONS)
           ua_architecture_add_definitions("-DOPEN62541_FEERTOS_USE_OWN_MEM")
         endif(UA_ARCH_FREERTOS_USE_OWN_MEMORY_FUNCTIONS)
-        ua_add_architecture_header_beginning(${CMAKE_CURRENT_SOURCE_DIR}/../common/freeRTOS62541.h
-                                             ${CMAKE_CURRENT_SOURCE_DIR}/../common/lwip62541.h
-                                                                                                  ) 
+        ua_add_architecture_header_beginning(${CMAKE_CURRENT_SOURCE_DIR}/../common/ua_freeRTOS.h
+                                             ${CMAKE_CURRENT_SOURCE_DIR}/../common/ua_lwip.h
+                                             )
     endif()
 endif()

+ 3 - 3
arch/freertosLWIP/ua_architecture.h

@@ -11,10 +11,10 @@
 #ifndef PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_
 #define PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_
 
-#include "../common/lwip62541.h"
-#include "../common/freeRTOS62541.h"
+#include "ua_lwip.h"
+#include "ua_freeRTOS.h"
 
-#include "../ua_architecture_functions.h"
+#include "ua_architecture_functions.h"
 
 #endif /* PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_ */
 

+ 1 - 1
arch/posix/ua_architecture.h

@@ -134,7 +134,7 @@
     LOG; \
 }
 
-#include "../ua_architecture_functions.h"
+#include "ua_architecture_functions.h"
 
 #if defined(__APPLE__)  && defined(_SYS_QUEUE_H_)
 //  in some compilers there's already a _SYS_QUEUE_H_ which is included first and doesn't have all functions

+ 1 - 1
arch/vxworks/ua_architecture.h

@@ -107,7 +107,7 @@
     LOG; \
 }
 
-#include "../ua_architecture_functions.h"
+#include "ua_architecture_functions.h"
 
 #endif /* PLUGINS_ARCH_VXWORKS_UA_ARCHITECTURE_H_ */
 

+ 1 - 1
arch/wec7/ua_architecture.h

@@ -136,7 +136,7 @@ char *strerror(int errnum);
 }
 #define UA_LOG_SOCKET_ERRNO_GAI_WRAP UA_LOG_SOCKET_ERRNO_WRAP
 
-#include "../ua_architecture_functions.h"
+#include "ua_architecture_functions.h"
 
 /* Fix redefinition of SLIST_ENTRY on mingw winnt.h */
 #if !defined(_SYS_QUEUE_H_) && defined(SLIST_ENTRY)

+ 1 - 1
arch/win32/ua_architecture.h

@@ -142,7 +142,7 @@
 }
 #define UA_LOG_SOCKET_ERRNO_GAI_WRAP UA_LOG_SOCKET_ERRNO_WRAP
 
-#include "../ua_architecture_functions.h"
+#include "ua_architecture_functions.h"
 
 /* Fix redefinition of SLIST_ENTRY on mingw winnt.h */
 #if !defined(_SYS_QUEUE_H_) && defined(SLIST_ENTRY)

+ 1 - 1
plugins/ua_network_pubsub_ethernet.c

@@ -13,7 +13,7 @@
 #include <linux/if_packet.h>
 
 #include "ua_network_pubsub_ethernet.h"
-#include "../src/ua_util_internal.h"
+#include "ua_util_internal.h"
 
 #ifndef ETHERTYPE_UADP
 #define ETHERTYPE_UADP  0xb62c

+ 1 - 1
plugins/ua_nodestore_default.c

@@ -8,7 +8,7 @@
 
 #include "ua_nodestore_default.h"
 
-#include "../src/ua_util_internal.h" /* TOOO: Move atomic operations to arch definitions */
+#include "ua_util_internal.h" /* TOOO: Move atomic operations to arch definitions */
 
 /* container_of */
 #define container_of(ptr, type, member) \