diff options
| -rw-r--r-- | tools/blktap2/include/blk_uuid.h | 2 | ||||
| -rw-r--r-- | tools/blktap2/include/libvhd.h | 4 | ||||
| -rw-r--r-- | tools/blktap2/vhd/lib/libvhd.c | 10 | ||||
| -rw-r--r-- | tools/console/daemon/io.c | 5 | ||||
| -rw-r--r-- | tools/misc/gtraceview.c | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/tools/blktap2/include/blk_uuid.h b/tools/blktap2/include/blk_uuid.h index 598ab2b661..9d554a9ce5 100644 --- a/tools/blktap2/include/blk_uuid.h +++ b/tools/blktap2/include/blk_uuid.h @@ -27,7 +27,7 @@ #ifndef __BLKTAP2_UUID_H__ #define __BLKTAP2_UUID_H__ -#if defined(__linux__) || defined(__Linux__) +#if defined(__linux__) #include <uuid/uuid.h> diff --git a/tools/blktap2/include/libvhd.h b/tools/blktap2/include/libvhd.h index 71082ad843..ac6908415e 100644 --- a/tools/blktap2/include/libvhd.h +++ b/tools/blktap2/include/libvhd.h @@ -28,7 +28,7 @@ #define _VHD_LIB_H_ #include <string.h> -#if defined(__linux__) || defined(__Linux__) +#if defined(__linux__) #include <endian.h> #include <byteswap.h> #elif defined(__NetBSD__) @@ -44,7 +44,7 @@ #endif #if BYTE_ORDER == LITTLE_ENDIAN -#if defined(__linux__) || defined(__Linux__) +#if defined(__linux__) #define BE16_IN(foo) (*(foo)) = bswap_16(*(foo)) #define BE32_IN(foo) (*(foo)) = bswap_32(*(foo)) #define BE64_IN(foo) (*(foo)) = bswap_64(*(foo)) diff --git a/tools/blktap2/vhd/lib/libvhd.c b/tools/blktap2/vhd/lib/libvhd.c index 1dd36238e6..ae691a0a1e 100644 --- a/tools/blktap2/vhd/lib/libvhd.c +++ b/tools/blktap2/vhd/lib/libvhd.c @@ -1335,7 +1335,7 @@ vhd_macx_encode_location(char *name, char **out, int *outlen) snprintf(uri, ibl+1, "file://%s", name); if (iconv(cd, -#if defined(__linux__) || defined(__Linux__) +#ifdef __linux__ (char **) #endif &urip, &ibl, &uri_utf8p, &obl) == (size_t)-1 || @@ -1425,7 +1425,7 @@ vhd_w2u_encode_location(char *name, char **out, int *outlen) } if (iconv(cd, -#if defined(__linux__) || defined(__Linux__) +#ifdef __linux__ (char **) #endif &urip, &ibl, &uri_utf16p, &obl) == (size_t)-1 || @@ -1470,7 +1470,7 @@ vhd_macx_decode_location(const char *in, char *out, int len) return NULL; if (iconv(cd, -#if defined(__linux__) || defined(__Linux__) +#ifdef __linux__ (char **) #endif &in, &ibl, &out, &obl) == (size_t)-1 || ibl) @@ -1502,7 +1502,7 @@ vhd_w2u_decode_location(const char *in, char *out, int len, char *utf_type) return NULL; if (iconv(cd, -#if defined(__linux__) || defined(__Linux__) +#ifdef __linux__ (char **) #endif &in, &ibl, &out, &obl) == (size_t)-1 || ibl) @@ -2498,7 +2498,7 @@ vhd_initialize_header_parent_name(vhd_context_t *ctx, const char *parent_path) memset(dst, 0, obl); if (iconv(cd, -#if defined(__linux__) || defined(__Linux__) +#ifdef __linux__ (char **) #endif &pname, &ibl, &dst, &obl) == (size_t)-1 || ibl) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 67fb22c612..5a6ccbfd43 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -39,10 +39,9 @@ #include <assert.h> #if defined(__NetBSD__) || defined(__OpenBSD__) #include <util.h> -#elif defined(__linux__) || defined(__Linux__) +#elif defined(__linux__) #include <pty.h> -#endif -#if defined(__sun__) +#elif defined(__sun__) #include <stropts.h> #endif diff --git a/tools/misc/gtraceview.c b/tools/misc/gtraceview.c index c86a809030..411a54e9a0 100644 --- a/tools/misc/gtraceview.c +++ b/tools/misc/gtraceview.c @@ -30,7 +30,7 @@ #include <xenctrl.h> #include <xen/trace.h> -#ifdef __Linux__ +#ifdef __linux__ #include <ncurses.h> #endif #ifdef __NetBSD__ |