summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/compiler.h
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/common/compiler.h')
-rw-r--r--hw/xfree86/common/compiler.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index aca769722..f3ef80e50 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1615,7 +1615,7 @@ extern void outl(unsigned int a, unsigned int l);
# endif
# endif
# ifndef SCO325
-# if defined(USL)
+# if defined(__UNIXWARE__)
# if defined(IN_MODULE)
# /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */
# define ushort unsigned short
@@ -1627,15 +1627,15 @@ extern void outl(unsigned int a, unsigned int l);
# else
# include <sys/types.h>
# endif /* IN_MODULE */
-# endif /* USL */
+# endif /* __UNIXWARE__ */
# if !defined(sgi) && !defined(__SUNPRO_C)
# include <sys/inline.h>
# endif
# else
# include "scoasm.h"
# endif
-# if !defined(__HIGHC__) && !defined(SCO325) && !defined(sgi) && \
- !defined(__SUNPRO_C)
+# if (!defined(__HIGHC__) && !defined(sgi) && !defined(__SUNPRO_C)) \
+ || defined(__USLC__)
# pragma asm partial_optimization outl
# pragma asm partial_optimization outw
# pragma asm partial_optimization outb