# HG changeset patch # User john.levon@xxxxxxx # Date 1229369745 28800 # Node ID 9e1a44b5c166b73e36d3cffc5398af0bec39ddc7 # Parent 2bee618a0557131c383b124b2b88bd407b462df4 Fix __sun conditional It's __sun not __sun__. Signed-off-by: John Levon <john.levon@xxxxxxx> diff --git a/src/xen_internal.c b/src/xen_internal.c --- 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_d #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 --- 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 --- 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" -- Libvir-list mailing list Libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list