diff options
author | Daniel Mack <zonque@gmail.com> | 2014-08-19 16:22:53 +0200 |
---|---|---|
committer | Daniel Mack <zonque@gmail.com> | 2014-08-19 16:22:53 +0200 |
commit | afb737db68c8a9a46db3034f888250b1ce11f61d (patch) | |
tree | fcc7547cbea3585787620a14a58d106c7a436096 | |
parent | baeb2d8bbf2360524d4104ea851407a14085cef9 (diff) | |
download | kdbus-bus-afb737db68c8a9a46db3034f888250b1ce11f61d.tar.gz kdbus-bus-afb737db68c8a9a46db3034f888250b1ce11f61d.tar.bz2 kdbus-bus-afb737db68c8a9a46db3034f888250b1ce11f61d.zip |
Revert "test/Makefile: only look at $(KERNELDIR)/usr/include for files with quotes"
This reverts commit baeb2d8bbf2360524d4104ea851407a14085cef9.
Turns out this confuses cpp even more.
For now, people have to to 'make headers_install' in the kernel dir before
building kdbus.
-rw-r--r-- | test/Makefile | 3 | ||||
-rw-r--r-- | test/kdbus-util.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/Makefile b/test/Makefile index a0a1edb1fb9..38459a275fe 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,7 +1,6 @@ CFLAGS += -std=gnu99 -Wall -Wextra -g \ + -I$(KERNELDIR)/usr/include \ -I$(KERNELDIR)/include/uapi \ - -I. \ - -I- \ -D_GNU_SOURCE \ -Wno-unused-parameter \ -Wmaybe-uninitialized \ diff --git a/test/kdbus-util.c b/test/kdbus-util.c index 67b7435c7c1..f79d7ecf680 100644 --- a/test/kdbus-util.c +++ b/test/kdbus-util.c @@ -24,10 +24,10 @@ #include <sys/ioctl.h> #include <sys/mman.h> #include <sys/stat.h> +#include <linux/memfd.h> #include <linux/unistd.h> #include <linux/fcntl.h> -#include "linux/memfd.h" #include "kdbus-util.h" #include "kdbus-enum.h" |