code sync with tizen_3.0

Change-Id: I9cb8d0fa8518f8e91dc389ac09a7acae1ca23121
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c93dcb..03434f9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,6 @@ ADD_DEFINITIONS("-D_TZ_SYS_RO_SHARE=\"${TZ_SYS_RO_SHARE}\"")
 ADD_DEFINITIONS("-D_TZ_SYS_SHARE=\"${TZ_SYS_SHARE}\"")
 ADD_DEFINITIONS("-DSETTING_DEF_RES=\"${SETTING_DEF_RES}\"")
 
-
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SYSTEM_SETTINGS_UTIL}/include)

diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c
index 491e8ae..54b091d 100644 (file)
--- a/src/system_setting_platform.c
+++ b/src/system_setting_platform.c
@@ -45,6 +45,7 @@
 #include <system_settings_ringtones.h>
 #include <system_settings_json.h>
 
+#include <system-setting-config.h>
 
 #include <tzplatform_config.h>
 #include <alarm.h>