r42: Reverse the header-checking logic: use a local nbd.h and fall back to

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index 9743523..87051f1 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -13,6 +13,8 @@
 #include <errno.h>
 #include <string.h>
 #include <netdb.h>
+#include <netinet/tcp.h>
+#include <stdlib.h>
 
 #if SIZEOF_UNSIGNED_SHORT_INT==4
 typedef unsigned short u32;
@@ -34,7 +36,20 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
+#ifdef HAVE_LOCAL_NBD_H
+#include "nbd.h"
+#else
+#ifdef HAVE_LINUX_NBD_H
 #include <linux/nbd.h>
+#else
+#error I need an nbd.h somewhere. Either install it in <linux/nbd.h> or put it in the current directory.
+#endif
+#endif
+
+#if NBD_LFS==1
+#define _LARGEFILE_SOURCE
+#define _FILE_OFFSET_BITS 64
+#endif
 
 u64 cliserv_magic = 0x00420281861253LL;
 #define INIT_PASSWD "NBDMAGIC"