# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1246567530 -3600
# Node ID d461c4d8af17c86dc7e4a1ff730f85634e73eb26
# Parent 8fecba36bc63a9587f520ed5da3bfffdb1173fb4
tools: Always check for __linux__ not __Linux__
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/blktap2/include/blk_uuid.h | 2 +-
tools/blktap2/include/libvhd.h | 4 ++--
tools/blktap2/vhd/lib/libvhd.c | 10 +++++-----
tools/console/daemon/io.c | 5 ++---
tools/misc/gtraceview.c | 2 +-
5 files changed, 11 insertions(+), 12 deletions(-)
diff -r 8fecba36bc63 -r d461c4d8af17 tools/blktap2/include/blk_uuid.h
--- a/tools/blktap2/include/blk_uuid.h Thu Jul 02 16:45:31 2009 +0100
+++ b/tools/blktap2/include/blk_uuid.h Thu Jul 02 21:45:30 2009 +0100
@@ -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 -r 8fecba36bc63 -r d461c4d8af17 tools/blktap2/include/libvhd.h
--- a/tools/blktap2/include/libvhd.h Thu Jul 02 16:45:31 2009 +0100
+++ b/tools/blktap2/include/libvhd.h Thu Jul 02 21:45:30 2009 +0100
@@ -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 -r 8fecba36bc63 -r d461c4d8af17 tools/blktap2/vhd/lib/libvhd.c
--- a/tools/blktap2/vhd/lib/libvhd.c Thu Jul 02 16:45:31 2009 +0100
+++ b/tools/blktap2/vhd/lib/libvhd.c Thu Jul 02 21:45:30 2009 +0100
@@ -1335,7 +1335,7 @@ vhd_macx_encode_location(char *name, cha
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
}
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,
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,
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_co
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 -r 8fecba36bc63 -r d461c4d8af17 tools/console/daemon/io.c
--- a/tools/console/daemon/io.c Thu Jul 02 16:45:31 2009 +0100
+++ b/tools/console/daemon/io.c Thu Jul 02 21:45:30 2009 +0100
@@ -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 -r 8fecba36bc63 -r d461c4d8af17 tools/misc/gtraceview.c
--- a/tools/misc/gtraceview.c Thu Jul 02 16:45:31 2009 +0100
+++ b/tools/misc/gtraceview.c Thu Jul 02 21:45:30 2009 +0100
@@ -30,7 +30,7 @@
#include <xenctrl.h>
#include <xen/trace.h>
-#ifdef __Linux__
+#ifdef __linux__
#include <ncurses.h>
#endif
#ifdef __NetBSD__
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home