From baeb2d8bbf2360524d4104ea851407a14085cef9 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Tue, 19 Aug 2014 15:19:40 +0200
Subject: [PATCH] test/Makefile: only look at $(KERNELDIR)/usr/include for
 files with quotes

This is a hack to make cpp look at system include files first, and then
consult $(KERNELDIR)/usr/include. For this to work, include directives
referring to files in uapi have to be addressed with quotes.
---
 test/Makefile     | 3 ++-
 test/kdbus-util.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 38459a2..a0a1edb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,6 +1,7 @@
 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 f79d7ec..67b7435 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"
 
-- 
2.34.1