diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/blktap/drivers/blktapctrl.c | 2 | ||||
| -rw-r--r-- | tools/blktap/drivers/bswap.h | 7 | ||||
| -rw-r--r-- | tools/blktap/drivers/qcow-create.c | 1 | ||||
| -rw-r--r-- | tools/blktap/drivers/tapdisk.c | 1 | ||||
| -rw-r--r-- | tools/blktap/lib/xenbus.c | 1 | ||||
| -rw-r--r-- | tools/blktap/lib/xs_api.c | 1 |
6 files changed, 7 insertions, 6 deletions
diff --git a/tools/blktap/drivers/blktapctrl.c b/tools/blktap/drivers/blktapctrl.c index 7045880668..8e630aeeee 100644 --- a/tools/blktap/drivers/blktapctrl.c +++ b/tools/blktap/drivers/blktapctrl.c @@ -41,7 +41,6 @@ #include <err.h> #include <errno.h> #include <sys/types.h> -#include <linux/types.h> #include <sys/wait.h> #include <signal.h> #include <fcntl.h> @@ -50,7 +49,6 @@ #include <string.h> #include <unistd.h> #include <xs.h> -#include <printf.h> #include <sys/time.h> #include <syslog.h> diff --git a/tools/blktap/drivers/bswap.h b/tools/blktap/drivers/bswap.h index bb9de92b25..51251505d3 100644 --- a/tools/blktap/drivers/bswap.h +++ b/tools/blktap/drivers/bswap.h @@ -5,6 +5,11 @@ #include <inttypes.h> +#if defined(__NetBSD__) || defined(__OpenBSD__) +#include <sys/endian.h> +#include <sys/types.h> +#else + #ifdef HAVE_BYTESWAP_H #include <byteswap.h> #else @@ -73,6 +78,8 @@ static inline void bswap64s(uint64_t *s) *s = bswap64(*s); } +#endif + #if defined(WORDS_BIGENDIAN) #define be_bswap(v, size) (v) #define le_bswap(v, size) bswap ## size(v) diff --git a/tools/blktap/drivers/qcow-create.c b/tools/blktap/drivers/qcow-create.c index 79492f1bf5..eaec6dfcc2 100644 --- a/tools/blktap/drivers/qcow-create.c +++ b/tools/blktap/drivers/qcow-create.c @@ -37,7 +37,6 @@ #include <sys/statvfs.h> #include <sys/stat.h> #include <sys/ioctl.h> -#include <linux/fs.h> #include <string.h> #include "tapdisk.h" diff --git a/tools/blktap/drivers/tapdisk.c b/tools/blktap/drivers/tapdisk.c index ae1d7d6ccd..993e09b155 100644 --- a/tools/blktap/drivers/tapdisk.c +++ b/tools/blktap/drivers/tapdisk.c @@ -27,7 +27,6 @@ #include <poll.h> #include <sys/statvfs.h> #include <sys/ioctl.h> -#include <linux/fs.h> #include "blktaplib.h" #include "tapdisk.h" diff --git a/tools/blktap/lib/xenbus.c b/tools/blktap/lib/xenbus.c index 53a3338f1e..cf6b841618 100644 --- a/tools/blktap/lib/xenbus.c +++ b/tools/blktap/lib/xenbus.c @@ -37,7 +37,6 @@ #include <stdio.h> #include <stdlib.h> -#include <printf.h> #include <string.h> #include <err.h> #include <stdarg.h> diff --git a/tools/blktap/lib/xs_api.c b/tools/blktap/lib/xs_api.c index 783b4ce3b3..41bbd47bb2 100644 --- a/tools/blktap/lib/xs_api.c +++ b/tools/blktap/lib/xs_api.c @@ -34,7 +34,6 @@ #include <stdio.h> #include <stdlib.h> -#include <printf.h> #include <string.h> #include <err.h> #include <stdarg.h> |