From 98c664c20bd85ef09e9eb8c94235d37a9172d4f9 Mon Sep 17 00:00:00 2001
From: dh79pyun <dh79.pyun@samsung.com>
Date: Mon, 13 Dec 2021 15:42:00 +0900
Subject: [PATCH] Fix the 64bit build error for g_memdup

Change-Id: Iaf38a435af93c840ecdcbb77b49510da01edcebc
Signed-off-by: dh79pyun <dh79.pyun@samsung.com>
---
 plugins/policy.c              | 4 ++++
 profiles/audio/avctp.c        | 4 ++++
 src/adapter_le_vsc_features.c | 2 +-
 src/log.h                     | 4 ----
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/policy.c b/plugins/policy.c
index 0eca6b4..fe4aef2 100755
--- a/plugins/policy.c
+++ b/plugins/policy.c
@@ -46,6 +46,10 @@
 #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 e194bf5..2666c5d 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 dbfe015..660dcbd 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 e62f5aa..1662e56 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, ...)
-- 
2.7.4