Fix build error

    Fixed conflict type qualifiers for __malloc_initialize_hook.
    Removed Werror.

Change-Id: I34138cca08d5280d5b9de81896e25e78b1f9d957
Signed-off-by: Junfeng Dong <junfeng.dong@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cff6104..7366c7c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ ADD_DEFINITIONS("-DLOG_TAG=\"DATA_PROVIDER_SLAVE\"")
 ADD_DEFINITIONS(${pkg_CFLAGS})
 
 # -fpie
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -Werror -g -fno-builtin-malloc")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -g -fno-builtin-malloc")
 #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
 ADD_EXECUTABLE(${PROJECT_NAME}

diff --git a/packaging/org.tizen.data-provider-slave.changes b/packaging/org.tizen.data-provider-slave.changes
new file mode 100644 (file)
index 0000000..30dd162
--- /dev/null
+++ b/packaging/org.tizen.data-provider-slave.changes
@@ -0,0 +1,3 @@
+* Thu Jun 27 2013 Junfeng Dong <junfeng.dong@intel.com> accepted/tizen/20130530.164858@9c8da9b
+- Fix build error
+

diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index c2ee2d7..5e05282 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -45,7 +45,7 @@ Supporting the In-house livebox only.
 %build
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 #-fpie  LDFLAGS="${LDFLAGS} -pie -O3"
-CFLAGS="${CFLAGS} -Wall -Winline -Werror -fno-builtin-malloc" make %{?jobs:-j%jobs}
+CFLAGS="${CFLAGS} -Wall -Winline -fno-builtin-malloc" make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}

diff --git a/src/main.c b/src/main.c
index 32d4ce1..8bd502c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -335,7 +335,12 @@ static void app_service(service_h service, void *data)
        return;
 }
 
-void (*__malloc_initialize_hook)(void) = heap_monitor_init;
+/*Define it as empty for libc < 2.14  */
+#ifndef __MALLOC_HOOK_VOLATILE
+# define __MALLOC_HOOK_VOLATILE
+#endif
+
+void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook)(void) = heap_monitor_init;
 
 #if defined(_ENABLE_MCHECK)
 static inline void mcheck_cb(enum mcheck_status status)