Revert "Fix the 64bit build error for g_memdup"

This reverts commit 98c664c20bd85ef09e9eb8c94235d37a9172d4f9.

Change-Id: Ifa0b40080c257205012a642e5059a765f169f402
Signed-off-by: dh79pyun <dh79.pyun@samsung.com>

diff --git a/plugins/policy.c b/plugins/policy.c
index fe4aef2..0eca6b4 100755 (executable)
--- a/plugins/policy.c
+++ b/plugins/policy.c
@@ -46,10 +46,6 @@
 #include "src/hcid.h"
 
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-#include "tizen_def.h"
-#endif
-
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
 #define CONTROL_CONNECT_TIMEOUT 4
 #define TARGET_CONNECT_TIMEOUT 1
 #else

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index 2666c5d..e194bf5 100644 (file)
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -56,10 +56,6 @@
 #include "avctp.h"
 #include "avrcp.h"
 
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-#include "tizen_def.h"
-#endif
-
 /* AV/C Panel 1.23, page 76:
  * command with the pressed value is valid for two seconds
  */

diff --git a/src/adapter_le_vsc_features.c b/src/adapter_le_vsc_features.c
index 660dcbd..dbfe015 100755 (executable)
--- a/src/adapter_le_vsc_features.c
+++ b/src/adapter_le_vsc_features.c
@@ -2,9 +2,9 @@
 
 #include <errno.h>
 
+#include "log.h"
 #include "adapter.h"
 #include "eir.h"
-#include "log.h"
 
 #include "../profile.h"
 #include "adapter_le_vsc_features.h"

diff --git a/src/log.h b/src/log.h
index 1662e56..e62f5aa 100755 (executable)
--- a/src/log.h
+++ b/src/log.h
@@ -23,6 +23,10 @@
 
 #include <stdint.h>
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+#include "tizen_def.h"
+#endif
+
 void info(const char *format, ...) __attribute__((format(printf, 1, 2)));
 
 void btd_log(uint16_t index, int priority, const char *format, ...)