From 427bad890497c40a08a356ccb6ce5e47997e94e6 Mon Sep 17 00:00:00 2001 From: eidheim Date: Fri, 27 Jan 2017 14:46:35 +0100 Subject: [PATCH] Fixes #1: corrected bluetooth/uuid.h includes. Also added missing .gitignore file. --- .gitignore | 1 + CMakeLists.txt | 2 +- bluez/attrib/att.c | 2 +- bluez/attrib/gatt.c | 2 +- bluez/attrib/gattrib.c | 2 +- examples/gatttool/gatttool.c | 2 +- examples/gatttool/interactive.c | 2 +- examples/gatttool/utils.c | 2 +- include/gattlib.h | 2 +- src/gattlib_connect.c | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build diff --git a/CMakeLists.txt b/CMakeLists.txt index 8266203..01f7f8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ project(gattlib) find_package(PkgConfig REQUIRED) -include_directories(include bluez/attrib bluez/btio bluez/src) +include_directories(include bluez/attrib bluez/btio bluez/src bluez/lib) # Bluez specific files set(gattlib_SRCS bluez/attrib/att.c diff --git a/bluez/attrib/att.c b/bluez/attrib/att.c index c8e2e1d..95c456d 100644 --- a/bluez/attrib/att.c +++ b/bluez/attrib/att.c @@ -27,7 +27,7 @@ #include #include -#include +#include "uuid.h" #include diff --git a/bluez/attrib/gatt.c b/bluez/attrib/gatt.c index 6f9a11d..1f3db8c 100644 --- a/bluez/attrib/gatt.c +++ b/bluez/attrib/gatt.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include "uuid.h" #include #include diff --git a/bluez/attrib/gattrib.c b/bluez/attrib/gattrib.c index 875d3a2..534c107 100644 --- a/bluez/attrib/gattrib.c +++ b/bluez/attrib/gattrib.c @@ -29,7 +29,7 @@ #include #include -#include +#include "uuid.h" #include "log.h" #include "att.h" diff --git a/examples/gatttool/gatttool.c b/examples/gatttool/gatttool.c index d50930f..e4a2b30 100644 --- a/examples/gatttool/gatttool.c +++ b/examples/gatttool/gatttool.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include "uuid.h" #include "att.h" #include "btio.h" diff --git a/examples/gatttool/interactive.c b/examples/gatttool/interactive.c index 81289f2..f8a7219 100644 --- a/examples/gatttool/interactive.c +++ b/examples/gatttool/interactive.c @@ -26,7 +26,7 @@ #include #include -#include +#include "uuid.h" #include #include diff --git a/examples/gatttool/utils.c b/examples/gatttool/utils.c index 0d9e4c2..e011704 100644 --- a/examples/gatttool/utils.c +++ b/examples/gatttool/utils.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include "uuid.h" #include #include "gattlib.h" diff --git a/include/gattlib.h b/include/gattlib.h index 1caab31..9dd57f8 100644 --- a/include/gattlib.h +++ b/include/gattlib.h @@ -29,7 +29,7 @@ #include #include -#include +#include "uuid.h" #ifndef BDADDR_BREDR /* GattLib note: BD Address have only been introduced into Bluez v4.100. */ diff --git a/src/gattlib_connect.c b/src/gattlib_connect.c index 8b620d3..9fb9844 100644 --- a/src/gattlib_connect.c +++ b/src/gattlib_connect.c @@ -27,7 +27,7 @@ #include #include -#include +#include "uuid.h" #include "gattlib_internal.h"