From 0604e9efe089dd74d21d216491750e038d074c71 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 17 Dec 2008 21:31:51 +0000
Subject: [PATCH] Fix __sun macro check (John Levon)

---
 ChangeLog          | 6 ++++++
 src/xen_internal.c | 6 +++---
 src/xen_unified.c  | 2 +-
 src/xs_internal.c  | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12564da963..057b7ecb36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 17 21:30:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	Fix conditional checks for Solaris platform (John Levon)
+	* src/xen_internal.c, src/xen_unified.c, src/xs_internal.c:
+	s/__sun__/__sun/
+
 Wed Dec 17 21:17:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	Fix Xen sub-drivers' 'open' method return type (John Levon)
diff --git a/src/xen_internal.c b/src/xen_internal.c
index ade013092d..b3a531e3ca 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -76,7 +76,7 @@ typedef struct v1_hypercall_struct
 #define XEN_V1_IOCTL_HYPERCALL_CMD                  \
     _IOC(_IOC_NONE, 'P', 0, sizeof(v1_hypercall_t))
 typedef v1_hypercall_t hypercall_t;
-#elif defined(__sun__)
+#elif defined(__sun)
 typedef privcmd_hypercall_t hypercall_t;
 #else
 #error "unsupported platform"
@@ -663,7 +663,7 @@ typedef struct xen_op_v2_dom xen_op_v2_dom;
 #define XEN_HYPERVISOR_SOCKET	"/proc/xen/privcmd"
 #define HYPERVISOR_CAPABILITIES	"/sys/hypervisor/properties/capabilities"
 #define CPUINFO			"/proc/cpuinfo"
-#elif defined(__sun__)
+#elif defined(__sun)
 #define XEN_HYPERVISOR_SOCKET	"/dev/xen/privcmd"
 #define HYPERVISOR_CAPABILITIES	""
 #define CPUINFO			"/dev/cpu/self/cpuid"
@@ -1906,7 +1906,7 @@ xenHypervisorInit(void)
         goto detect_v2;
     }
 
-#ifndef __sun__
+#ifndef __sun
     /*
      * check if the old hypercall are actually working
      */
diff --git a/src/xen_unified.c b/src/xen_unified.c
index 6daeac86d7..0be2dd36f1 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -213,7 +213,7 @@ xenUnifiedProbe (void)
     if (virFileExists("/proc/xen"))
         return 1;
 #endif
-#ifdef __sun__
+#ifdef __sun
     FILE *fh;
 
     if (fh = fopen("/dev/xen/domcaps", "r")) {
diff --git a/src/xs_internal.c b/src/xs_internal.c
index 13f51e91c1..56e6f9be53 100644
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -39,7 +39,7 @@
 
 #ifdef __linux__
 #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd"
-#elif defined(__sun__)
+#elif defined(__sun)
 #define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd"
 #else
 #error "unsupported platform"