From: dh79pyun <dh79.pyun@samsung.com>
Date: Mon, 13 Dec 2021 04:40:22 +0000 (+0900)
Subject: Use g_memdup2 instead of g_memdup
X-Git-Tag: submit/tizen/20211212.233427~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82053d0b6c107e3dacb63bcb36c0efe49e45f2bd;p=platform%2Fupstream%2Fbluez.git

Use g_memdup2 instead of g_memdup

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

diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index df66e794..01f6fd88 100755
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -31,6 +31,10 @@ extern "C" {
 #include <dbus/dbus.h>
 #include <glib.h>
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+#include "tizen_def.h"
+#endif
+
 typedef struct GDBusArgInfo GDBusArgInfo;
 typedef struct GDBusMethodTable GDBusMethodTable;
 typedef struct GDBusSignalTable GDBusSignalTable;
diff --git a/gobex/gobex-defs.h b/gobex/gobex-defs.h
index 326e3cb0..a4b9b9de 100755
--- a/gobex/gobex-defs.h
+++ b/gobex/gobex-defs.h
@@ -25,6 +25,10 @@
 
 #include <glib.h>
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+#include "tizen_def.h"
+#endif
+
 typedef enum {
 	G_OBEX_DATA_INHERIT,
 	G_OBEX_DATA_COPY,
diff --git a/src/log.h b/src/log.h
index 1662e564..e62f5aaa 100755
--- 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, ...)
diff --git a/src/shared/util.h b/src/shared/util.h
index 9193068d..2bdab3c1 100755
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -27,6 +27,10 @@
 #include <byteswap.h>
 #include <string.h>
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+#include "tizen_def.h"
+#endif
+
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/tizen_def.h b/tizen_def.h
new file mode 100644
index 00000000..a2715920
--- /dev/null
+++ b/tizen_def.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __TIZEN_DEF_H__
+#define __TIZEN_DEF_H__
+
+#define g_memdup g_memdup2
+
+#endif /* __TIZEN_DEF_H__ */
+