diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-25 08:57:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-25 08:57:48 +0000 |
| commit | 4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f (patch) | |
| tree | 456b739c6aed0350fa1f1faa5e48c00d6aa8c186 /xorg-server/hw/xfree86/vbe | |
| parent | 33b487abbf3fa5c2798f7a753607fb227878e119 (diff) | |
| parent | 74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58 (diff) | |
| download | vcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.tar.gz vcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.tar.bz2 vcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/vbe')
| -rw-r--r-- | xorg-server/hw/xfree86/vbe/vbe.c | 1 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/vbe/vbe.h | 2 |
2 files changed, 1 insertions, 2 deletions
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
|