diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-01 15:06:59 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-01 15:06:59 +0000 |
| commit | c6c51e2b3bb144149f008573b683f62caeffa263 (patch) | |
| tree | 24d7dd072ee88206d9485923d6fab599ba0b734f /hw/xfree86/vbe/vbe.h | |
| parent | b58d2e37a7a18122764133b439bf7eb0924e22b6 (diff) | |
3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE
2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).
Diffstat (limited to 'hw/xfree86/vbe/vbe.h')
| -rw-r--r-- | hw/xfree86/vbe/vbe.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 30756119d..3a1b48749 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.3 2003/11/14 14:58:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.5 2004/02/02 03:55:32 dawes Exp $ */ /* * XFree86 vbe module @@ -60,7 +60,8 @@ typedef struct vbeControllerInfoBlock { CARD8 OemData[256]; } vbeControllerInfoRec, *vbeControllerInfoPtr; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(SCO) || defined(__USLC__) || \ + defined(__SUNPRO_C) #pragma pack() /* All GCC versions recognise this syntax */ #else #pragma pack(0) |