From: dh79pyun <dh79.pyun@samsung.com>
Date: Wed, 22 Dec 2021 23:18:05 +0000 (+0900)
Subject: Revert "Use g_memdup2 instead of g_memdup"
X-Git-Tag: accepted/tizen/unified/20211228.140430~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73250556d7ed8090afdce53f823c7fd1094976b4;p=platform%2Fupstream%2Fbluez.git

Revert "Use g_memdup2 instead of g_memdup"

This reverts commit 82053d0b6c107e3dacb63bcb36c0efe49e45f2bd.

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

diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index 01f6fd8..df66e79 100755
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -31,10 +31,6 @@ 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 a4b9b9d..326e3cb 100755
--- a/gobex/gobex-defs.h
+++ b/gobex/gobex-defs.h
@@ -25,10 +25,6 @@
 
 #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 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, ...)
diff --git a/src/shared/util.h b/src/shared/util.h
index 2bdab3c..9193068 100755
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -27,10 +27,6 @@
 #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
deleted file mode 100644
index a271592..0000000
--- a/tizen_def.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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__ */
-