diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2019-07-24 09:24:50 +0100 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-07-24 09:11:44 -0600 |
commit | c31c7ec4bcd7bb0d7b28897d730431c02b9d4ea1 (patch) | |
tree | baffe189e6dc69fa17adc8fe08ad1d133b328ade /examples | |
parent | b42c59d7afc79370cf0140d5b9978b1e8c350408 (diff) |
src/Makefile: keep private headers in <liburing/*.h>
It is not possible to install barrier.h and compat.h into the top-level
/usr/include directly since they are likely to conflict with other
software. io_uring.h could be confused with the system's kernel header
file.
Put liburing headers into <liburing/*.h> so there is no chance of
conflicts or confusion.
Existing applications continue to build successfully since the location
of <liburing.h> is unchanged. In-tree examples and tests require
modification because src/liburing.h is moved to src/include/liburing.h.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/Makefile | 2 | ||||
-rw-r--r-- | examples/io_uring-cp.c | 2 | ||||
-rw-r--r-- | examples/io_uring-test.c | 2 | ||||
-rw-r--r-- | examples/link-cp.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/Makefile b/examples/Makefile index ed73fcd..1539ecc 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,5 +1,5 @@ CFLAGS ?= -g -O2 -override CFLAGS += -Wall -D_GNU_SOURCE -L../src/ +override CFLAGS += -Wall -D_GNU_SOURCE -L../src/ -I../src/include/ all_targets += io_uring-test io_uring-cp link-cp diff --git a/examples/io_uring-cp.c b/examples/io_uring-cp.c index 97f61aa..adb7b29 100644 --- a/examples/io_uring-cp.c +++ b/examples/io_uring-cp.c @@ -12,7 +12,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h> -#include "../src/liburing.h" +#include "liburing.h" #define QD 64 #define BS (32*1024) diff --git a/examples/io_uring-test.c b/examples/io_uring-test.c index 0b975ad..4f5ebf6 100644 --- a/examples/io_uring-test.c +++ b/examples/io_uring-test.c @@ -9,7 +9,7 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> -#include "../src/liburing.h" +#include "liburing.h" #define QD 4 diff --git a/examples/link-cp.c b/examples/link-cp.c index a4c02e5..af80a2e 100644 --- a/examples/link-cp.c +++ b/examples/link-cp.c @@ -13,7 +13,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h> -#include "../src/liburing.h" +#include "liburing.h" #define QD 64 #define BS (32*1024) |