r196: Allow compiling against Linux 2.6.18 nbd.h

diff --git a/cliserv.h b/cliserv.h
index 569d1ce..6802580 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,6 +35,9 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
 #error I need at least some 64-bit type
 #endif
 

+#define __be32 u32
+#define __be64 u64
+

 #ifdef NBD_H_LOCAL
 #include "nbd.h"
 #endif
 #ifdef NBD_H_LOCAL
 #include "nbd.h"
 #endif

diff --git a/configure.ac b/configure.ac
index 15fb669..d300bd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,8 @@ esac
 AC_MSG_CHECKING(where to find a working nbd.h)
 AC_TRY_COMPILE([#define u32 int
 #define u64 int
 AC_MSG_CHECKING(where to find a working nbd.h)
 AC_TRY_COMPILE([#define u32 int
 #define u64 int

+#define __be32 int
+#define __be64 int

 #include "nbd.h"
 ],
 [int foo=NBD_CMD_DISC], 
 #include "nbd.h"
 ],
 [int foo=NBD_CMD_DISC], 

@@ -76,6 +78,8 @@ AC_TRY_COMPILE([#define u32 int
     NBD_H='"nbd.h"'],
   AC_TRY_COMPILE([#define u32 int
 #define u64 int
     NBD_H='"nbd.h"'],
   AC_TRY_COMPILE([#define u32 int
 #define u64 int

+#define __be32 int
+#define __be64 int

 #include <linux/nbd.h>
   ],
 [int foo=NBD_CMD_DISC],
 #include <linux/nbd.h>
   ],
 [int foo=NBD_CMD_DISC],