[PATCH] Add __x86 to ifdefs to use vesa if building with Sun compilers

Alan Coopersmith alan.coopersmith at sun.com
Wed Dec 16 16:45:11 PST 2009


Sun compilers don't include the trailing __ after __i386 and __amd64
like gcc, but do provide __x86 as a shorthand for __i386 || __amd64 .

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 hw/xfree86/common/xf86AutoConfig.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index a6199b0..8b39a8f 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -503,7 +503,8 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
 
     /* Fallback to platform default hardware */
     if (i < (nmatches - 1)) {
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+#if defined(__i386__) || defined(__amd64__) || defined(__x86) \
+ || defined(__hurd__)
 	matches[i++] = xnfstrdup("vesa");
 #elif defined(__sparc__) && !defined(sun)
 	matches[i++] = xnfstrdup("sunffb");
-- 
1.5.6.5



More information about the xorg-devel mailing list