aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-10-25 19:10:56 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-10-26 17:15:43 +0200
commit421ac118bf0dff35533421b8171444d6cf419023 (patch)
tree836cc1b66b9a226f98ee949badf82e13eb43fbb4
parente532f01fc3028ee8d766a692651243661b2769f8 (diff)
Avoid duplicated _GNU_SOURCE definition warning
Change-Id: I2b805a60b67db1a72b429093256999673e2c3964 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--ctl-lib/CMakeLists.txt2
-rw-r--r--ctl-lib/ctl-config.c4
-rw-r--r--ctl-lib/ctl-config.h2
-rw-r--r--ctl-lib/ctl-lua.h2
-rw-r--r--ctl-lib/ctl-plugin.h3
5 files changed, 7 insertions, 6 deletions
diff --git a/ctl-lib/CMakeLists.txt b/ctl-lib/CMakeLists.txt
index 2630b94..3f5f434 100644
--- a/ctl-lib/CMakeLists.txt
+++ b/ctl-lib/CMakeLists.txt
@@ -25,7 +25,6 @@ else(CONTROL_SUPPORT_LUA)
message(STATUS "Warning: LUA Without Support ")
endif(CONTROL_SUPPORT_LUA)
-
# Add target to project dependency list
PROJECT_TARGET_ADD(ctl-utilities)
@@ -41,4 +40,3 @@ PROJECT_TARGET_ADD(ctl-utilities)
TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
)
-
diff --git a/ctl-lib/ctl-config.c b/ctl-lib/ctl-config.c
index 42d2897..2056f09 100644
--- a/ctl-lib/ctl-config.c
+++ b/ctl-lib/ctl-config.c
@@ -187,7 +187,3 @@ PUBLIC int CtlLoadSections(AFB_ApiT apiHandle, CtlConfigT *ctlHandle, CtlSection
OnErrorExit:
return 1;
}
-
-
-
-
diff --git a/ctl-lib/ctl-config.h b/ctl-lib/ctl-config.h
index f7eb44c..a7b07b5 100644
--- a/ctl-lib/ctl-config.h
+++ b/ctl-lib/ctl-config.h
@@ -21,7 +21,9 @@
#ifndef _CTL_CONFIG_INCLUDE_
#define _CTL_CONFIG_INCLUDE_
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include "ctl-plugin.h"
#include <filescan-utils.h>
diff --git a/ctl-lib/ctl-lua.h b/ctl-lib/ctl-lua.h
index 8a1a3f1..d0d89bd 100644
--- a/ctl-lib/ctl-lua.h
+++ b/ctl-lib/ctl-lua.h
@@ -21,7 +21,9 @@
#ifndef _LUA_CTL_INCLUDE_
#define _LUA_CTL_INCLUDE_
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
// prefix start debug script
#ifndef CONTROL_DOSCRIPT_PRE
diff --git a/ctl-lib/ctl-plugin.h b/ctl-lib/ctl-plugin.h
index f2bc33e..0bdb4b9 100644
--- a/ctl-lib/ctl-plugin.h
+++ b/ctl-lib/ctl-plugin.h
@@ -21,7 +21,10 @@
#define _CTL_PLUGIN_INCLUDE_
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
+
#include <json-c/json.h>
// Waiting for a clean AppFW-V3 API