r74: * Added checks for GLib (not used yet, but will be in this release)

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index 87051f1..b05e7ee 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -9,7 +9,6 @@
    Send 128 bytes of zeros (reserved for future use)
  */
 
-#include "config.h"
 #include <errno.h>
 #include <string.h>
 #include <netdb.h>
@@ -36,15 +35,7 @@ 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
+#include NBD_H
 
 #if NBD_LFS==1
 #define _LARGEFILE_SOURCE
@@ -98,7 +89,7 @@ void err(const char *s)
 
        s1[maxlen-1] = '\0';
 #ifdef ISSERVER
-       syslog(LOG_ERR, s1);
+       syslog(LOG_ERR, "%s", s1);
 #else
        fprintf(stderr, "Error: %s\n", s1);
 #endif