r10: Changes from Wouter Verhelst to use nbd.h from linux tree, instead of

nonexistent local copy.

diff --git a/Makefile.in b/Makefile.in
index a8c0512..43b07a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,11 +15,11 @@ all: $(CMDS)
 
 nbd-client: nbd-client.o
 
-nbd-client.o: nbd-client.c cliserv.h nbd.h config.h
+nbd-client.o: nbd-client.c cliserv.h config.h
 
 nbd-server: nbd-server.o
 
-nbd-server.o: nbd-server.c cliserv.h nbd.h config.h
+nbd-server.o: nbd-server.c cliserv.h config.h
        $(CC) $(CFLAGS) $(FSCHOICE) -c nbd-server.c
 
 install: $(CMDS)

diff --git a/cliserv.h b/cliserv.h
index b9557ff..4f7aa78 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -36,7 +36,7 @@ typedef unsigned long long u64;
 #endif
 #endif /* FS_32BIT */
 
-#include "nbd.h"
+#include <linux/nbd.h>
 
 #ifdef FS_32BIT
 struct { unsigned char m[8]; } cliserv_magic = { { 0x00, 0x00, 0x42, 0x02, 0x81, 0x86, 0x12, 0x53 } };