build: Remove glib-compat.h support

diff --git a/Makefile.am b/Makefile.am
index 4368593..62705f6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,7 +286,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
                        src/attrib-server.h src/attrib-server.c \
                        src/sdp-xml.h src/sdp-xml.c \
                        src/sdp-client.h src/sdp-client.c \
-                       src/textfile.h src/textfile.c src/glib-compat.h \
+                       src/textfile.h src/textfile.c \
                        src/glib-helper.h src/glib-helper.c \
                        src/oui.h src/oui.c src/uinput.h src/ppoll.h \
                        src/plugin.h src/plugin.c \

diff --git a/attrib/client.c b/attrib/client.c
index b5282c2..35f1c90 100644 (file)
--- a/attrib/client.c
+++ b/attrib/client.c
@@ -34,7 +34,6 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/uuid.h>
 
-#include "glib-compat.h"
 #include "adapter.h"
 #include "device.h"
 #include "log.h"

diff --git a/attrib/gatt-service.c b/attrib/gatt-service.c
index 6a44a06..d8f7b37 100644 (file)
--- a/attrib/gatt-service.c
+++ b/attrib/gatt-service.c
@@ -37,7 +37,6 @@
 #include "attrib-server.h"
 #include "gatt-service.h"
 #include "log.h"
-#include "glib-compat.h"
 
 struct gatt_info {
        bt_uuid_t uuid;

diff --git a/attrib/gatt.c b/attrib/gatt.c
index 1c3ff78..b9c2bbb 100644 (file)
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
@@ -33,8 +33,6 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "glib-compat.h"
-
 #include "att.h"
 #include "gattrib.h"
 #include "gatt.h"

diff --git a/audio/a2dp.c b/audio/a2dp.c
index 623a0bc..cc8f139 100644 (file)
--- a/audio/a2dp.c
+++ b/audio/a2dp.c
@@ -37,7 +37,6 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "glib-compat.h"
 #include "log.h"
 #include "device.h"
 #include "manager.h"

diff --git a/audio/avdtp.c b/audio/avdtp.c
index 8b36f0b..327b76f 100644 (file)
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -52,7 +52,6 @@
 #include "manager.h"
 #include "control.h"
 #include "avdtp.h"
-#include "glib-compat.h"
 #include "btio.h"
 #include "sink.h"
 #include "source.h"

diff --git a/audio/avrcp.c b/audio/avrcp.c
index fd0094b..df39d04 100644 (file)
--- a/audio/avrcp.c
+++ b/audio/avrcp.c
@@ -52,7 +52,6 @@
 #include "avctp.h"
 #include "avrcp.h"
 #include "sdpd.h"
-#include "glib-compat.h"
 #include "dbus-common.h"
 
 /* Company IDs for vendor dependent commands */

diff --git a/audio/gateway.c b/audio/gateway.c
index c549ef5..7b9347d 100644 (file)
--- a/audio/gateway.c
+++ b/audio/gateway.c
@@ -42,7 +42,6 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
-#include "glib-compat.h"
 #include "sdp-client.h"
 #include "device.h"
 #include "gateway.h"

diff --git a/audio/headset.c b/audio/headset.c
index 04b26a9..f15951d 100644 (file)
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -53,7 +53,6 @@
 #include "error.h"
 #include "telephony.h"
 #include "headset.h"
-#include "glib-compat.h"
 #include "sdp-client.h"
 #include "btio.h"
 #include "dbus-common.h"

diff --git a/audio/telephony-maemo6.c b/audio/telephony-maemo6.c
index 943f1e1..0727ffe 100644 (file)
--- a/audio/telephony-maemo6.c
+++ b/audio/telephony-maemo6.c
@@ -38,7 +38,6 @@
 
 #include <bluetooth/sdp.h>
 
-#include "glib-compat.h"
 #include "log.h"
 #include "telephony.h"
 #include "error.h"

diff --git a/audio/telephony-ofono.c b/audio/telephony-ofono.c
index 3607d7f..961fedd 100644 (file)
--- a/audio/telephony-ofono.c
+++ b/audio/telephony-ofono.c
@@ -37,7 +37,6 @@
 
 #include <bluetooth/sdp.h>
 
-#include "glib-compat.h"
 #include "log.h"
 #include "telephony.h"
 

diff --git a/audio/unix.c b/audio/unix.c
index 6e970f8..9a10764 100644 (file)
--- a/audio/unix.c
+++ b/audio/unix.c
@@ -52,7 +52,6 @@
 #include "source.h"
 #include "gateway.h"
 #include "unix.h"
-#include "glib-compat.h"
 
 #define check_nul(str) (str[sizeof(str) - 1] == '\0')
 

diff --git a/deviceinfo/deviceinfo.c b/deviceinfo/deviceinfo.c
index 95fa12d..6345f52 100644 (file)
--- a/deviceinfo/deviceinfo.c
+++ b/deviceinfo/deviceinfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <bluetooth/uuid.h>
-#include "glib-compat.h"
+
 #include "adapter.h"
 #include "device.h"
 #include "gattrib.h"

diff --git a/network/connection.c b/network/connection.c
index 15c781f..36b51a7 100644 (file)
--- a/network/connection.c
+++ b/network/connection.c
@@ -38,7 +38,6 @@
 #include <gdbus.h>
 
 #include "log.h"
-#include "glib-compat.h"
 #include "btio.h"
 #include "dbus-common.h"
 #include "adapter.h"

diff --git a/network/server.c b/network/server.c
index 987cfca..58c7297 100644 (file)
--- a/network/server.c
+++ b/network/server.c
@@ -46,7 +46,6 @@
 #include "error.h"
 #include "sdpd.h"
 #include "btio.h"
-#include "glib-compat.h"
 
 #include "common.h"
 #include "server.h"

diff --git a/plugins/hciops.c b/plugins/hciops.c
index 6b4a82c..a62b160 100644 (file)
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -40,7 +40,6 @@
 
 #include <glib.h>
 
-#include "glib-compat.h"
 #include "hcid.h"
 #include "sdpd.h"
 #include "btio.h"

diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index 1601bf8..5663ef7 100644 (file)
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -49,7 +49,6 @@
 #include "event.h"
 #include "oob.h"
 #include "eir.h"
-#include "glib-compat.h"
 
 #define MGMT_BUF_SIZE 1024
 

diff --git a/serial/port.c b/serial/port.c
index 36e3bd6..ea45c7a 100644 (file)
--- a/serial/port.c
+++ b/serial/port.c
@@ -48,7 +48,6 @@
 #include "../src/dbus-common.h"
 
 #include "log.h"
-#include "glib-compat.h"
 #include "glib-helper.h"
 #include "sdp-client.h"
 #include "btio.h"

diff --git a/src/adapter.c b/src/adapter.c
index d10db10..d9d7c19 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -52,7 +52,6 @@
 #include "device.h"
 #include "dbus-common.h"
 #include "error.h"
-#include "glib-compat.h"
 #include "glib-helper.h"
 #include "agent.h"
 #include "storage.h"

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 18a0218..21b1501 100644 (file)
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -39,7 +39,6 @@
 
 #include "log.h"
 #include "gdbus.h"
-#include "glib-compat.h"
 #include "btio.h"
 #include "sdpd.h"
 #include "hcid.h"

diff --git a/src/device.c b/src/device.c
index b08d72c..ea6fec2 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -54,7 +54,6 @@
 #include "device.h"
 #include "dbus-common.h"
 #include "error.h"
-#include "glib-compat.h"
 #include "glib-helper.h"
 #include "sdp-client.h"
 #include "gatt.h"

diff --git a/src/eir.c b/src/eir.c
index 7b7b705..492af0d 100644 (file)
--- a/src/eir.c
+++ b/src/eir.c
@@ -35,7 +35,6 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/sdp.h>
 
-#include "glib-compat.h"
 #include "glib-helper.h"
 #include "eir.h"
 

diff --git a/src/glib-compat.h b/src/glib-compat.h
deleted file mode 100644 (file)
index b54d640..0000000
--- a/src/glib-compat.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2004-2011  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  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
- *
- */
-
-#ifdef NEED_G_SLIST_FREE_FULL
-static inline void g_slist_free_full(GSList *list, GDestroyNotify free_func)
-{
-       g_slist_foreach(list, (GFunc) free_func, NULL);
-       g_slist_free(list);
-}
-#endif
-
-#ifdef NEED_G_LIST_FREE_FULL
-static inline void g_list_free_full(GList *list, GDestroyNotify free_func)
-{
-       g_list_foreach(list, (GFunc) free_func, NULL);
-       g_list_free(list);
-}
-#endif

diff --git a/src/glib-helper.c b/src/glib-helper.c
index 8189a09..419c655 100644 (file)
--- a/src/glib-helper.c
+++ b/src/glib-helper.c
@@ -35,7 +35,6 @@
 #include <glib.h>
 
 #include "btio.h"
-#include "glib-compat.h"
 #include "glib-helper.h"
 
 char *bt_uuid2string(uuid_t *uuid)

diff --git a/src/storage.c b/src/storage.c
index e9413b4..14e5ac3 100644 (file)
--- a/src/storage.c
+++ b/src/storage.c
@@ -43,7 +43,6 @@
 #include <bluetooth/sdp_lib.h>
 
 #include "textfile.h"
-#include "glib-compat.h"
 #include "glib-helper.h"
 #include "storage.h"
 

diff --git a/thermometer/thermometer.c b/thermometer/thermometer.c
index 9d23275..92c0225 100644 (file)
--- a/thermometer/thermometer.c
+++ b/thermometer/thermometer.c
@@ -38,7 +38,6 @@
 #include "att.h"
 #include "gatt.h"
 #include "thermometer.h"
-#include "glib-compat.h"
 
 #define THERMOMETER_INTERFACE "org.bluez.Thermometer"