diff options
Diffstat (limited to 'hw/xfree86/vbe/vbe.h')
| -rw-r--r-- | hw/xfree86/vbe/vbe.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 5bca184f5..30756119d 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.1 2003/02/17 17:06:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.3 2003/11/14 14:58:45 tsi Exp $ */ /* * XFree86 vbe module @@ -60,7 +60,11 @@ typedef struct vbeControllerInfoBlock { CARD8 OemData[256]; } vbeControllerInfoRec, *vbeControllerInfoPtr; -#pragma pack() +#ifdef __GNUC__ +#pragma pack() /* All GCC versions recognise this syntax */ +#else +#pragma pack(0) +#endif #ifndef __GNUC__ #define __attribute__(a) @@ -237,8 +241,8 @@ typedef enum { } vbeScanwidthCommand; #define VBESetLogicalScanline(pVbe, width) \ - VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET, \ - width, NULL, NULL, NULL) + VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET, width, \ + NULL, NULL, NULL) #define VBESetLogicalScanlineBytes(pVbe, width) \ VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET_BYTES, width, \ NULL, NULL, NULL) @@ -246,8 +250,8 @@ typedef enum { VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET, 0, \ pixels, bytes, max) #define VBEGetMaxLogicalScanline(pVbe, pixels, bytes, max) \ - VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, \ - NULL, pixels, bytes, max) + VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, 0, \ + pixels, bytes, max) Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, int width, int *pixels, int *bytes, int *max); |