frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional fixes to allow building with Sun compilers on Solaris x86

This commit is contained in:
Alan Coopersmith 2004-02-18 21:43:19 +00:00
parent 07109fd63e
commit d52f3ac58f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xfree86/common/compiler.h
View File

@ -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 $ */ /* $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. * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
@ -113,6 +113,10 @@ extern int ffs(unsigned long);
; ;
# endif # endif
# if defined(__SUNPRO_C)
# define DO_PROTOTYPES
# endif
# if defined(NO_INLINE) || defined(DO_PROTOTYPES) # if defined(NO_INLINE) || defined(DO_PROTOTYPES)
# if !defined(__sparc__) && !defined(__arm32__) \ # if !defined(__sparc__) && !defined(__arm32__) \
@ -1537,7 +1541,7 @@ extern void outl(unsigned int a, unsigned int l);
#if 0 #if 0
# include <sys/types.h> # include <sys/types.h>
#endif #endif
# ifndef __HIGHC__ # if !defined(__HIGHC__) && !defined(__SUNPRO_C)
# ifndef __USLC__ # ifndef __USLC__
# define __USLC__ # define __USLC__
# endif # endif
@ -1563,7 +1567,8 @@ extern void outl(unsigned int a, unsigned int l);
# else # else
# include "scoasm.h" # include "scoasm.h"
# endif # 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 outl
# pragma asm partial_optimization outw # pragma asm partial_optimization outw
# pragma asm partial_optimization outb # pragma asm partial_optimization outb

3
hw/xfree86/vbe/vbe.h
View File

@ -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 $ */ /* $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]; CARD8 OemData[256];
} vbeControllerInfoRec, *vbeControllerInfoPtr; } vbeControllerInfoRec, *vbeControllerInfoPtr;
#ifdef __GNUC__ #if defined(__GNUC__) || defined(__SUNPRO_C)
#pragma pack() /* All GCC versions recognise this syntax */ #pragma pack() /* All GCC versions recognise this syntax */
#else #else
#pragma pack(0) #pragma pack(0)