Use -iquote for xv6 headers when compiling for Linux

e8d05a2a · Silas Boyd-Wickizer · 9c295417 · e8d05a2a · e8d05a2a · e8d05a2a
--- a/bin/xdu.cc
+++ b/bin/xdu.cc
@@ -10,10 +10,9 @@
 #include <stddef.h>
 #include <errno.h>
 typedef uint64_t u64;
-#include "include/wq.hh"
+#include "wq.hh"
+#include "reducer.hh"
 #include "user/dirit.hh"
-#include "include/percpu.hh"
-#include "include/reducer.hh"
 #define ST_SIZE(st)  (st).st_size
 #define ST_ISDIR(st) S_ISDIR((st).st_mode)
 #define BSIZ 256

--- a/include/reducer.hh
+++ b/include/reducer.hh
+#include "percpu.hh"
+
 template <typename T>
 struct reducer_opadd
 {

--- a/include/wq.hh
+++ b/include/wq.hh
 #pragma once

-#if defined(LINUX)
-#include <stdlib.h>
-#include <assert.h>
-#include <atomic>
-#define xmalloc(n)     malloc(n)
-#define xfree(p, sz)   free(p)
-#elif defined(XV6_KERNEL)
-#define xmalloc(n)   kmalloc(n) 
-#define xfree(p, sz) kmfree(p, sz)
-#else
-#warning "Unknown wq implementation"
-#endif
-
 #define WQSIZE 8192

 class work;
@@ -40,4 +27,17 @@ struct cwork : public work {
  void *arg4;
 };

+#if defined(LINUX)
+#include <stdlib.h>
+#include <assert.h>
+#include <atomic>
+#define xmalloc(n)     malloc(n)
+#define xfree(p, sz)   free(p)
+#elif defined(XV6_KERNEL)
+#define xmalloc(n)   kmalloc(n) 
+#define xfree(p, sz) kmfree(p, sz)
+#else
+#warning "Unknown wq implementation"
+#endif
+
 #include "wqfor.hh"
--- a/lib/wq.cc
+++ b/lib/wq.cc
 #if defined(LINUX)
 #include "user/wqlinux.hh"
-#include "include/percpu.hh"
+#include "percpu.hh"
 #elif defined(XV6_KERNEL)
 #include "wqkernel.hh"
 #include "percpu.hh"

--- a/user/Makefrag.wq
+++ b/user/Makefrag.wq
@@ -2,7 +2,8 @@ NCXXFLAGS = -static -g -MD -m64 -O3 -Wall -Werror -DHW_$(HW) \
 	    -fno-builtin -fno-strict-aliasing -fno-omit-frame-pointer \
 	    -fms-extensions -mcx16 -mno-red-zone -std=c++0x \
 	    -Wno-sign-compare -fno-exceptions -fno-rtti -fcheck-new \
-	    -I. -include param.h -include include/compiler.h
+	    -iquote . -iquote include \
+	    -include param.h -include include/compiler.h

 $(O)/user/%.o: lib/%.cc
 	@echo "  CXX    $@"