Browse Source

Fix vxworks compiler dependencies and add guard for eCos

Jose Cabral 6 years ago
parent
commit
ae1914b0ab
3 changed files with 16 additions and 3 deletions
  1. 3 0
      arch/eCos/ua_architecture.h
  2. 0 3
      arch/vxworks/CMakeLists.txt
  3. 13 0
      arch/vxworks/ua_architecture.h

+ 3 - 0
arch/eCos/ua_architecture.h

@@ -4,6 +4,7 @@
  *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  */
+#ifdef UA_ARCHITECTURE_ECOS
 
 #ifndef PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_
 #define PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_
@@ -112,3 +113,5 @@ int gethostname_ecos(char* name, size_t len);
 #undef _SYS_QUEUE_H_
 
 #endif /* PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_ */
+
+#endif /* UA_ARCHITECTURE_ECOS */

+ 0 - 3
arch/vxworks/CMakeLists.txt

@@ -12,9 +12,6 @@ if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "vxworks")
 
         ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-        ua_architecture_remove_definitions(-Werror -Wpedantic -Wno-static-in-inline)
-        ua_architecture_add_definitions(-D_WRS_KERNEL)
-
     endif()
 
 endif()

+ 13 - 0
arch/vxworks/ua_architecture.h

@@ -133,6 +133,19 @@
 #undef CIRCLEQ_INSERT_AFTER
 #undef CIRCLEQ_INSERT_BEFORE
 
+#undef SLIST_INSERT_AFTER
+#undef SLIST_INSERT_HEAD
+#undef SLIST_REMOVE_HEAD
+#undef LIST_INSERT_AFTER
+#undef LIST_INSERT_BEFORE
+#undef LIST_INSERT_HEAD
+#undef TAILQ_INSERT_HEAD
+#undef TAILQ_INSERT_TAIL
+#undef TAILQ_INSERT_AFTER
+#undef TAILQ_INSERT_BEFORE
+#undef CIRCLEQ_HEAD_INITIALIZER
+
+
 #undef _SYS_QUEUE_H_
 
 #endif /* PLUGINS_ARCH_VXWORKS_UA_ARCHITECTURE_H_ */