r215: Incorporate patch from SuSE

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index 2d52591..4ccff22 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,13 +35,14 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
+#ifdef NBD_H_LOCAL
+/* 2.6.18 and above use __be* rather than u* */
 #define __be32 u32
 #define __be64 u64
-
-#ifdef NBD_H_LOCAL
 #include "nbd.h"
 #endif
 #ifdef NBD_H_LINUX
+#include <linux/types.h>
 #include <linux/nbd.h>
 #endif