浏览代码

move C99 integer definitions to ua_config.h

Julius Pfrommer 7 年之前
父节点
当前提交
025f62eae0
共有 2 个文件被更改,包括 19 次插入16 次删除
  1. 19 0
      include/ua_config.h.in
  2. 0 16
      include/ua_types.h

+ 19 - 0
include/ua_config.h.in

@@ -40,6 +40,25 @@ extern "C" {
 #cmakedefine UA_ENABLE_DISCOVERY_SEMAPHORE
 #cmakedefine UA_DEBUG_DUMP_PKGS
 
+/**
+ * C99 Integers
+ * ------------ */
+#include <stddef.h>
+
+/* Include stdint.h and stdbool.h or workaround for older Visual Studios */
+#if !defined(_MSC_VER) || _MSC_VER >= 1600
+# include <stdint.h>
+# include <stdbool.h> /* C99 Boolean */
+#else
+# include "ms_stdint.h"
+# if !defined(__bool_true_false_are_defined)
+#  define bool short
+#  define true 1
+#  define false 0
+#  define __bool_true_false_are_defined
+# endif
+#endif
+
 /**
  * Assertions
  * ---------- */

+ 0 - 16
include/ua_types.h

@@ -9,22 +9,6 @@
 extern "C" {
 #endif
 
-#include <stddef.h>
-
-/* Include stdint.h and stdbool.h or workaround for older Visual Studios */
-#if !defined(_MSC_VER) || _MSC_VER >= 1600
-# include <stdint.h>
-# include <stdbool.h> /* C99 Boolean */
-#else
-# include "ms_stdint.h"
-# if !defined(__bool_true_false_are_defined)
-#  define bool short
-#  define true 1
-#  define false 0
-#  define __bool_true_false_are_defined
-# endif
-#endif
-
 #include "ua_config.h"
 #include "ua_constants.h"