From 8f90b38846ccf0b07a680bc08075a557d166832a Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 26 Dec 2017 22:44:27 +0200 Subject: [PATCH] monitor: Fix uuid.h includes Commit e0e7eb08d5d28a952221070a4b50794d63dcc625 tried to fix this, but missed most of the files concerned. Without the fix an out-of-tree build (e.g. make distcheck) will throw errors like this: CC monitor/l2cap.o ../monitor/l2cap.c:41:18: fatal error: uuid.h: No such file or directory #include "uuid.h" --- monitor/avctp.c | 2 +- monitor/bnep.c | 2 +- monitor/l2cap.c | 2 +- monitor/rfcomm.c | 2 +- monitor/sdp.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monitor/avctp.c b/monitor/avctp.c index de8c3459c..94385d252 100644 --- a/monitor/avctp.c +++ b/monitor/avctp.c @@ -33,13 +33,13 @@ #include #include "lib/bluetooth.h" +#include "lib/uuid.h" #include "src/shared/util.h" #include "bt.h" #include "packet.h" #include "display.h" #include "l2cap.h" -#include "uuid.h" #include "keys.h" #include "sdp.h" #include "avctp.h" diff --git a/monitor/bnep.c b/monitor/bnep.c index 38fd1319e..1d9d8fcd5 100644 --- a/monitor/bnep.c +++ b/monitor/bnep.c @@ -33,13 +33,13 @@ #include #include "lib/bluetooth.h" +#include "lib/uuid.h" #include "src/shared/util.h" #include "bt.h" #include "packet.h" #include "display.h" #include "l2cap.h" -#include "uuid.h" #include "keys.h" #include "sdp.h" #include "bnep.h" diff --git a/monitor/l2cap.c b/monitor/l2cap.c index 74f9bd7b3..c85934af1 100644 --- a/monitor/l2cap.c +++ b/monitor/l2cap.c @@ -32,13 +32,13 @@ #include #include "lib/bluetooth.h" +#include "lib/uuid.h" #include "src/shared/util.h" #include "bt.h" #include "packet.h" #include "display.h" #include "l2cap.h" -#include "uuid.h" #include "keys.h" #include "sdp.h" #include "avctp.h" diff --git a/monitor/rfcomm.c b/monitor/rfcomm.c index 742bd7f46..f3daf95ba 100644 --- a/monitor/rfcomm.c +++ b/monitor/rfcomm.c @@ -33,13 +33,13 @@ #include #include "lib/bluetooth.h" +#include "lib/uuid.h" #include "src/shared/util.h" #include "bt.h" #include "packet.h" #include "display.h" #include "l2cap.h" -#include "uuid.h" #include "keys.h" #include "sdp.h" #include "rfcomm.h" diff --git a/monitor/sdp.c b/monitor/sdp.c index f3a67457e..96fbeb864 100644 --- a/monitor/sdp.c +++ b/monitor/sdp.c @@ -32,6 +32,7 @@ #include #include "lib/bluetooth.h" +#include "lib/uuid.h" #include "src/shared/util.h" @@ -39,7 +40,6 @@ #include "packet.h" #include "display.h" #include "l2cap.h" -#include "uuid.h" #include "sdp.h" #define MAX_TID 16 -- 2.47.3