diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-02-18 21:43:19 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-02-18 21:43:19 +0000 |
| commit | d52f3ac58fd596fca392394f16acff84115f6e1d (patch) | |
| tree | 80e426bc5e574c8336a79143fed4b13e5c82b3dd | |
| parent | 07109fd63e0999905e6f7df8fd7f9c713d0dc2cc (diff) | |
Additional fixes to allow building with Sun compilers on Solaris x86
| -rw-r--r-- | hw/xfree86/common/compiler.h | 11 | ||||
| -rw-r--r-- | hw/xfree86/vbe/vbe.h | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index a9951e705..56b0b1a32 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 1.1.4.3 2003/12/20 00:28:26 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. @@ -113,6 +113,10 @@ extern int ffs(unsigned long); ; # endif +# if defined(__SUNPRO_C) +# define DO_PROTOTYPES +# endif + # if defined(NO_INLINE) || defined(DO_PROTOTYPES) # if !defined(__sparc__) && !defined(__arm32__) \ @@ -1537,7 +1541,7 @@ extern void outl(unsigned int a, unsigned int l); #if 0 # include <sys/types.h> #endif -# ifndef __HIGHC__ +# if !defined(__HIGHC__) && !defined(__SUNPRO_C) # ifndef __USLC__ # define __USLC__ # endif @@ -1563,7 +1567,8 @@ extern void outl(unsigned int a, unsigned int l); # else # include "scoasm.h" # endif -# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi) +# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi) && \ + !defined(__SUNPRO_C) # pragma asm partial_optimization outl # pragma asm partial_optimization outw # pragma asm partial_optimization outb diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 30756119d..f3af4ff52 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.3 2003/11/14 14:58:45 tsi Exp $ */ /* @@ -60,7 +61,7 @@ typedef struct vbeControllerInfoBlock { CARD8 OemData[256]; } vbeControllerInfoRec, *vbeControllerInfoPtr; -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__SUNPRO_C) #pragma pack() /* All GCC versions recognise this syntax */ #else #pragma pack(0) |