Fix the 64bit build error for g_memdup 08/267908/2 accepted/tizen/unified/20211222.230711 submit/tizen/20211212.233427
authordh79pyun <dh79.pyun@samsung.com>
Mon, 13 Dec 2021 06:42:00 +0000 (15:42 +0900)
committerdh79pyun <dh79.pyun@samsung.com>
Mon, 13 Dec 2021 09:21:13 +0000 (18:21 +0900)
Change-Id: Iaf38a435af93c840ecdcbb77b49510da01edcebc
Signed-off-by: dh79pyun <dh79.pyun@samsung.com>
plugins/policy.c
profiles/audio/avctp.c
src/adapter_le_vsc_features.c
src/log.h

index 0eca6b4..fe4aef2 100755 (executable)
 #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
index e194bf5..2666c5d 100644 (file)
 #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
  */
index dbfe015..660dcbd 100755 (executable)
@@ -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"
index e62f5aa..1662e56 100755 (executable)
--- a/src/log.h
+++ b/src/log.h
 
 #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, ...)