diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2015-02-28 23:33:09 -0800 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-02-28 23:33:09 -0800 |
commit | 17763527a330a888759022d212c98ddb3e91a30a (patch) | |
tree | e57f2166b5cde4d74eca0b038365b4b68ceb0b7e | |
parent | ee69b2482b9e0b2f869c164c75d9b9740a3b97b9 (diff) | |
download | bluez-17763527a330a888759022d212c98ddb3e91a30a.tar.gz |
profiles: Use local libbluetooth includes
-rw-r--r-- | profiles/alert/server.c | 4 | ||||
-rw-r--r-- | profiles/audio/media.c | 5 | ||||
-rw-r--r-- | profiles/audio/transport.c | 5 | ||||
-rw-r--r-- | profiles/cyclingspeed/cyclingspeed.c | 4 | ||||
-rw-r--r-- | profiles/deviceinfo/deviceinfo.c | 2 | ||||
-rw-r--r-- | profiles/gap/gas.c | 3 | ||||
-rw-r--r-- | profiles/health/hdp.c | 9 | ||||
-rw-r--r-- | profiles/heartrate/heartrate.c | 5 | ||||
-rw-r--r-- | profiles/input/hog.c | 9 | ||||
-rw-r--r-- | profiles/proximity/immalert.c | 5 | ||||
-rw-r--r-- | profiles/proximity/linkloss.c | 5 | ||||
-rw-r--r-- | profiles/proximity/manager.c | 5 | ||||
-rw-r--r-- | profiles/proximity/monitor.c | 9 | ||||
-rw-r--r-- | profiles/proximity/reporter.c | 8 | ||||
-rw-r--r-- | profiles/sap/manager.c | 3 | ||||
-rw-r--r-- | profiles/scanparam/scan.c | 2 | ||||
-rw-r--r-- | profiles/thermometer/thermometer.c | 6 | ||||
-rw-r--r-- | profiles/time/server.c | 10 |
18 files changed, 74 insertions, 25 deletions
diff --git a/profiles/alert/server.c b/profiles/alert/server.c index 8de5b3fa9..b99aa3fab 100644 --- a/profiles/alert/server.c +++ b/profiles/alert/server.c @@ -36,7 +36,11 @@ #include <fcntl.h> #include "lib/bluetooth.h" +#include "lib/hci.h" +#include "lib/hci_lib.h" +#include "lib/sdp.h" #include "lib/uuid.h" + #include "src/plugin.h" #include "src/dbus-common.h" #include "attrib/att.h" diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 633695c40..03646e610 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -31,10 +31,13 @@ #include <inttypes.h> #include <glib.h> -#include <gdbus/gdbus.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/plugin.h" #include "src/adapter.h" #include "src/device.h" diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index a267bfd69..112ec1768 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -29,10 +29,13 @@ #include <errno.h> #include <glib.h> -#include <gdbus/gdbus.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/adapter.h" #include "src/device.h" #include "src/dbus-common.h" diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c index 25fed8bc3..bd7e1e53e 100644 --- a/profiles/cyclingspeed/cyclingspeed.c +++ b/profiles/cyclingspeed/cyclingspeed.c @@ -30,7 +30,11 @@ #include <gdbus/gdbus.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/plugin.h" #include "src/adapter.h" #include "src/device.h" diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c index 4e5aed902..a0e9951ec 100644 --- a/profiles/deviceinfo/deviceinfo.c +++ b/profiles/deviceinfo/deviceinfo.c @@ -30,7 +30,9 @@ #include <glib.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + #include "src/plugin.h" #include "src/adapter.h" #include "src/device.h" diff --git a/profiles/gap/gas.c b/profiles/gap/gas.c index f73a3b8c6..819a9672f 100644 --- a/profiles/gap/gas.c +++ b/profiles/gap/gas.c @@ -31,7 +31,10 @@ #include <glib.h> #include "lib/bluetooth.h" +#include "lib/hci.h" +#include "lib/sdp.h" #include "lib/uuid.h" + #include "src/shared/util.h" #include "src/shared/att.h" #include "src/shared/queue.h" diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c index c1ce1b8c7..bc3b38ad8 100644 --- a/profiles/health/hdp.c +++ b/profiles/health/hdp.c @@ -31,9 +31,12 @@ #include <glib.h> -#include <bluetooth/bluetooth.h> -#include <bluetooth/l2cap.h> -#include <gdbus/gdbus.h> +#include "lib/bluetooth.h" +#include "lib/l2cap.h" +#include "lib/sdp.h" + +#include "gdbus/gdbus.h" + #include "src/dbus-common.h" #include "src/log.h" #include "src/error.h" diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c index 219b4cb8e..9e8c49931 100644 --- a/profiles/heartrate/heartrate.c +++ b/profiles/heartrate/heartrate.c @@ -27,10 +27,13 @@ #include <errno.h> #include <stdbool.h> #include <glib.h> -#include <gdbus/gdbus.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/plugin.h" #include "src/adapter.h" #include "src/dbus-common.h" diff --git a/profiles/input/hog.c b/profiles/input/hog.c index 74351f32a..3d23d5b40 100644 --- a/profiles/input/hog.c +++ b/profiles/input/hog.c @@ -35,20 +35,19 @@ #include <sys/stat.h> #include <fcntl.h> -#include <bluetooth/bluetooth.h> - #include <glib.h> -#include "src/log.h" - +#include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "src/log.h" #include "src/adapter.h" #include "src/device.h" #include "src/profile.h" #include "src/service.h" #include "src/shared/util.h" #include "src/shared/uhid.h" - #include "src/plugin.h" #include "suspend.h" diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c index 95d97f4cf..26a0ac941 100644 --- a/profiles/proximity/immalert.c +++ b/profiles/proximity/immalert.c @@ -29,10 +29,13 @@ #include <glib.h> #include <dbus/dbus.h> -#include <gdbus/gdbus.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/log.h" #include "src/adapter.h" #include "attrib/gattrib.h" diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c index 46e90f0e9..2f1ab13c3 100644 --- a/profiles/proximity/linkloss.c +++ b/profiles/proximity/linkloss.c @@ -29,10 +29,13 @@ #include <glib.h> #include <dbus/dbus.h> -#include <gdbus/gdbus.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/log.h" #include "src/adapter.h" #include "src/device.h" diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c index 8f36259b2..dbb3bda29 100644 --- a/profiles/proximity/manager.c +++ b/profiles/proximity/manager.c @@ -29,10 +29,13 @@ #include <stdbool.h> #include <glib.h> -#include <gdbus/gdbus.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/adapter.h" #include "src/device.h" #include "src/profile.h" diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c index b05cdd7c9..a583eb7da 100644 --- a/profiles/proximity/monitor.c +++ b/profiles/proximity/monitor.c @@ -28,17 +28,20 @@ #include <errno.h> #include <fcntl.h> -#include <gdbus/gdbus.h> #include <stdint.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> -#include <glib.h> -#include <bluetooth/bluetooth.h> +#include <glib.h> +#include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/dbus-common.h" #include "src/adapter.h" #include "src/device.h" diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c index 9979110cd..366d96bb3 100644 --- a/profiles/proximity/reporter.c +++ b/profiles/proximity/reporter.c @@ -32,12 +32,14 @@ #include <glib.h> #include <dbus/dbus.h> -#include <gdbus/gdbus.h> - -#include "src/log.h" #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + +#include "src/log.h" #include "src/dbus-common.h" #include "src/adapter.h" #include "src/device.h" diff --git a/profiles/sap/manager.c b/profiles/sap/manager.c index 5c2a0f106..b62239780 100644 --- a/profiles/sap/manager.c +++ b/profiles/sap/manager.c @@ -24,6 +24,9 @@ #include <stdbool.h> +#include "lib/bluetooth.h" +#include "lib/sdp.h" + #include "src/log.h" #include "src/adapter.h" #include "src/device.h" diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c index f4af0ac4f..fbda8a8bb 100644 --- a/profiles/scanparam/scan.c +++ b/profiles/scanparam/scan.c @@ -30,7 +30,9 @@ #include <errno.h> #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + #include "src/log.h" #include "src/plugin.h" #include "src/adapter.h" diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c index 608fb432f..b0fc3e005 100644 --- a/profiles/thermometer/thermometer.c +++ b/profiles/thermometer/thermometer.c @@ -27,10 +27,12 @@ #include <stdbool.h> #include <errno.h> -#include <gdbus/gdbus.h> - #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "gdbus/gdbus.h" + #include "src/plugin.h" #include "src/dbus-common.h" #include "src/adapter.h" diff --git a/profiles/time/server.c b/profiles/time/server.c index 1716a5ea0..2289c6a43 100644 --- a/profiles/time/server.c +++ b/profiles/time/server.c @@ -26,17 +26,21 @@ #include <config.h> #endif -#include <glib.h> #include <time.h> #include <errno.h> +#include <string.h> #include <stdbool.h> +#include <glib.h> + +#include "lib/bluetooth.h" +#include "lib/sdp.h" +#include "lib/uuid.h" + #include "src/adapter.h" #include "src/device.h" #include "src/profile.h" #include "src/plugin.h" - -#include "lib/uuid.h" #include "attrib/gattrib.h" #include "attrib/att.h" #include "attrib/gatt.h" |