[Xorg-commit] xc/programs/Xserver/hw/xfree86/common compiler.h,1.1.4.3,1.1.4.4

[Alan Coopersmith]

Committed by: alanc

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/common
In directory pdx:/tmp/cvs-serv15488/programs/Xserver/hw/xfree86/common

Modified Files:
      Tag: XORG-CURRENT
	compiler.h 
Log Message:
Additional fixes to allow building with Sun compilers on Solaris x86


Index: compiler.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/compiler.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/compiler.h	20 Dec 2003 00:28:26 -0000	1.1.4.3
+++ b/compiler.h	18 Feb 2004 21:43:19 -0000	1.1.4.4
@@ -113,6 +113,10 @@
         ;
 # 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 @@
 #if 0
 #     include <sys/types.h>
 #endif
-#     ifndef __HIGHC__
+#     if !defined(__HIGHC__) && !defined(__SUNPRO_C)
 #      ifndef __USLC__
 #       define __USLC__
 #      endif
@@ -1563,7 +1567,8 @@
 #    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