diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2015-02-28 22:40:14 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-02-28 22:40:14 -0800 |
| commit | 571124ffdbf50b0b5294f5ce788725b987f4f76f (patch) | |
| tree | 9cf2f084ba0457c1a6f73bc1a06c786946f99765 /attrib | |
| parent | 92ea0af0d61ff80a315793cdbeaa25be769fd986 (diff) | |
| download | bluez-571124ffdbf50b0b5294f5ce788725b987f4f76f.tar.gz | |
attrib: Use local libbluetooth includes
Diffstat (limited to 'attrib')
| -rw-r--r-- | attrib/att.c | 6 | ||||
| -rw-r--r-- | attrib/gatt.c | 8 | ||||
| -rw-r--r-- | attrib/gatt.h | 2 | ||||
| -rw-r--r-- | attrib/gattrib.c | 6 | ||||
| -rw-r--r-- | attrib/gatttool.c | 12 | ||||
| -rw-r--r-- | attrib/interactive.c | 4 | ||||
| -rw-r--r-- | attrib/utils.c | 10 |
7 files changed, 27 insertions, 21 deletions
diff --git a/attrib/att.c b/attrib/att.c index 268045824..826b3c183 100644 --- a/attrib/att.c +++ b/attrib/att.c @@ -30,12 +30,12 @@ #include <stdint.h> #include <stdlib.h> -#include <bluetooth/bluetooth.h> - #include <glib.h> -#include "src/shared/util.h" +#include "lib/bluetooth.h" #include "lib/uuid.h" + +#include "src/shared/util.h" #include "att.h" static inline void put_uuid_le(const bt_uuid_t *src, void *dst) diff --git a/attrib/gatt.c b/attrib/gatt.c index ea5c1cf83..480f87425 100644 --- a/attrib/gatt.c +++ b/attrib/gatt.c @@ -28,12 +28,14 @@ #include <stdint.h> #include <stdlib.h> + #include <glib.h> -#include <bluetooth/sdp.h> -#include <bluetooth/sdp_lib.h> -#include "src/shared/util.h" +#include "lib/sdp.h" +#include "lib/sdp_lib.h" #include "lib/uuid.h" + +#include "src/shared/util.h" #include "att.h" #include "gattrib.h" #include "gatt.h" diff --git a/attrib/gatt.h b/attrib/gatt.h index f6db10fe3..63b2940dc 100644 --- a/attrib/gatt.h +++ b/attrib/gatt.h @@ -22,8 +22,6 @@ * */ -#include <bluetooth/sdp.h> - /* * GATT Characteristic Property bit field * Reference: Core SPEC 4.1 page 2183 (Table 3.5: Characteristic Properties diff --git a/attrib/gattrib.c b/attrib/gattrib.c index c36a207b7..514fc8f5f 100644 --- a/attrib/gattrib.c +++ b/attrib/gattrib.c @@ -26,14 +26,14 @@ #include "config.h" #endif +#include <stdio.h> #include <stdint.h> #include <stdbool.h> #include <string.h> -#include <glib.h> -#include <stdio.h> +#include <glib.h> -#include <bluetooth/bluetooth.h> +#include "lib/bluetooth.h" #include "btio/btio.h" #include "src/log.h" diff --git a/attrib/gatttool.c b/attrib/gatttool.c index b8e0f680d..1a40c943a 100644 --- a/attrib/gatttool.c +++ b/attrib/gatttool.c @@ -27,16 +27,18 @@ #endif #include <errno.h> -#include <glib.h> #include <stdlib.h> #include <unistd.h> -#include <bluetooth/bluetooth.h> -#include <bluetooth/hci.h> -#include <bluetooth/hci_lib.h> +#include <glib.h> -#include "src/shared/util.h" +#include "lib/bluetooth.h" +#include "lib/hci.h" +#include "lib/hci_lib.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "src/shared/util.h" #include "att.h" #include "btio/btio.h" #include "gattrib.h" diff --git a/attrib/interactive.c b/attrib/interactive.c index 8db10946d..451be23fb 100644 --- a/attrib/interactive.c +++ b/attrib/interactive.c @@ -38,9 +38,11 @@ #include <readline/readline.h> #include <readline/history.h> -#include "src/shared/util.h" #include "lib/bluetooth.h" +#include "lib/sdp.h" #include "lib/uuid.h" + +#include "src/shared/util.h" #include "btio/btio.h" #include "att.h" #include "gattrib.h" diff --git a/attrib/utils.c b/attrib/utils.c index 8f9a4c07d..8e2fc1a42 100644 --- a/attrib/utils.c +++ b/attrib/utils.c @@ -26,13 +26,15 @@ #endif #include <stdlib.h> -#include <glib.h> -#include <bluetooth/bluetooth.h> -#include <bluetooth/hci.h> -#include <bluetooth/hci_lib.h> +#include <glib.h> +#include "lib/bluetooth.h" +#include "lib/hci.h" +#include "lib/hci_lib.h" +#include "lib/sdp.h" #include "lib/uuid.h" + #include "btio/btio.h" #include "att.h" #include "gattrib.h" |