r196: Allow compiling against Linux 2.6.18 nbd.h

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index ebcb036..6802580 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,14 +35,14 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
-#ifdef HAVE_LOCAL_NBD_H
+#define __be32 u32
+#define __be64 u64
+
+#ifdef NBD_H_LOCAL
 #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
+#ifdef NBD_H_LINUX
+#include <linux/nbd.h>
 #endif
 
 #if NBD_LFS==1
@@ -78,17 +78,16 @@ void err(const char *s)
 {
        const int maxlen = 150;
        char s1[maxlen], *s2;
-       int n = 0;
 
        strncpy(s1, s, maxlen);
-       if (s2 = strstr(s, "%m")) {
+       if ((s2 = strstr(s, "%m"))) {
                strcpy(s1 + (s2 - s), strerror(errno));
                s2 += 2;
                strcpy(s1 + strlen(s1), s2);
        }
 #ifndef        sun
        /* Solaris doesn't have %h in syslog */
-       else if (s2 = strstr(s, "%h")) {
+       else if ((s2 = strstr(s, "%h"))) {
                strcpy(s1 + (s2 - s), hstrerror(h_errno));
                s2 += 2;
                strcpy(s1 + strlen(s1), s2);