Fix c header (#5)

* remove trailing ; for defines * correctly set extern c
ros2 · Mar 28, 2017 · e6ff864 · e6ff864
1 parent bb2fd05
commit e6ff864
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/include/c_utilities/types.h b/include/c_utilities/types.h
@@ -15,7 +15,16 @@
 #ifndef C_UTILITIES__TYPES_H_
 #define C_UTILITIES__TYPES_H_
 
+#if __cplusplus
+extern "C"
+{
+#endif
+
 #include "c_utilities/types/string_array.h"
 #include "c_utilities/types/utilities_ret.h"
 
+#if __cplusplus
+}
+#endif
+
 #endif  // C_UTILITIES__TYPES_H_
diff --git a/include/c_utilities/types/string_array.h b/include/c_utilities/types/string_array.h
@@ -15,6 +15,11 @@
 #ifndef C_UTILITIES__TYPES__STRING_ARRAY_H_
 #define C_UTILITIES__TYPES__STRING_ARRAY_H_
 
+#if __cplusplus
+extern "C"
+{
+#endif
+
 #include <string.h>
 
 #include "c_utilities/types/utilities_ret.h"
@@ -38,4 +43,8 @@ C_UTILITIES_PUBLIC
 utilities_ret_t
 utilities_string_array_fini(string_array_t * array);
 
+#if __cplusplus
+}
+#endif
+
 #endif  // C_UTILITIES__TYPES__STRING_ARRAY_H_
diff --git a/include/c_utilities/types/utilities_ret.h b/include/c_utilities/types/utilities_ret.h
@@ -15,9 +15,18 @@
 #ifndef C_UTILITIES__TYPES__UTILITIES_RET_H_
 #define C_UTILITIES__TYPES__UTILITIES_RET_H_
 
+#if __cplusplus
+extern "C"
+{
+#endif
+
 typedef int utilities_ret_t;
-#define UTILITIES_RET_OK 0;
-#define UTILITIES_RET_WARN 1;
-#define UTILITIES_RET_ERROR 2;
+#define UTILITIES_RET_OK 0
+#define UTILITIES_RET_WARN 1
+#define UTILITIES_RET_ERROR 2
+
+#if __cplusplus
+}
+#endif
 
 #endif  // C_UTILITIES__TYPES__UTILITIES_RET_H_