From cfed79e853100948cc14e4af034108400f4e4d6d Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 25 Oct 2017 19:10:56 +0200 Subject: Avoid duplicated _GNU_SOURCE definition warning Change-Id: I2b805a60b67db1a72b429093256999673e2c3964 Signed-off-by: Romain Forlot --- ctl-lib/CMakeLists.txt | 2 -- ctl-lib/ctl-config.c | 4 ---- ctl-lib/ctl-config.h | 2 ++ ctl-lib/ctl-lua.h | 2 ++ ctl-lib/ctl-plugin.h | 3 +++ 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 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 // Waiting for a clean AppFW-V3 API -- cgit 1.2.3-korg