From 74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 25 May 2010 06:29:35 +0000
Subject: xserver git update 25/5/2010

---
 xorg-server/hw/xfree86/vbe/vbe.c | 1 -
 xorg-server/hw/xfree86/vbe/vbe.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'xorg-server/hw/xfree86/vbe')

diff --git a/xorg-server/hw/xfree86/vbe/vbe.c b/xorg-server/hw/xfree86/vbe/vbe.c
index bb88b86cf..21fe0c812 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.c
+++ b/xorg-server/hw/xfree86/vbe/vbe.c
@@ -17,7 +17,6 @@
 
 #include "xf86.h"
 #include "vbe.h"
-#include <X11/Xarch.h>
 #include <X11/extensions/dpmsconst.h>
 
 #define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)
diff --git a/xorg-server/hw/xfree86/vbe/vbe.h b/xorg-server/hw/xfree86/vbe/vbe.h
index 4786709ea..5bb163df8 100644
--- a/xorg-server/hw/xfree86/vbe/vbe.h
+++ b/xorg-server/hw/xfree86/vbe/vbe.h
@@ -65,7 +65,7 @@ typedef struct vbeControllerInfoBlock {
 #pragma pack(0)
 #endif
 
-#ifndef __GNUC__
+#if !( defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) )
 #define __attribute__(a)
 #endif
 
-- 
cgit v1.2.3