From: dh79pyun <dh79.pyun@samsung.com>
Date: Mon, 13 Dec 2021 06:42:00 +0000 (+0900)
Subject: Fix the 64bit build error for g_memdup
X-Git-Tag: submit/tizen/20211212.233427^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98c664c20bd85ef09e9eb8c94235d37a9172d4f9;p=platform%2Fupstream%2Fbluez.git

Fix the 64bit build error for g_memdup

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

diff --git a/plugins/policy.c b/plugins/policy.c
index 0eca6b4d..fe4aef2e 100755
--- a/plugins/policy.c
+++ b/plugins/policy.c
@@ -45,6 +45,10 @@
 #include "src/profile.h"
 #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
diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index e194bf52..2666c5d0 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -56,6 +56,10 @@
 #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 dbfe015e..660dcbda 100755
--- 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 e62f5aaa..1662e564 100755
--- a/src/log.h
+++ b/src/log.h
@@ -23,10 +23,6 @@
 
 #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, ...)