diff options
| author | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:04 +0000 |
|---|---|---|
| committer | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:04 +0000 |
| commit | 43cd56b87ff1866778b43e494ab3dcbd9017c140 (patch) | |
| tree | e3a86e350dd14d81c8bacba094c3fc094f417ae1 /util/AsmMacros.h | |
| parent | b9c4a3ddd1fe26da0e7b4c0e87f603d6c645b17d (diff) | |
SCO port update for SCO OpenServer 5 and UnixWare 7. A few general cleanupssco_port_update
and bugs not specifically related to the port fixed along the way.
Diffstat (limited to 'util/AsmMacros.h')
| -rw-r--r-- | util/AsmMacros.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/util/AsmMacros.h b/util/AsmMacros.h index feb5ce0..98e0b04 100644 --- a/util/AsmMacros.h +++ b/util/AsmMacros.h @@ -57,7 +57,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/AsmMacros.h,v 1.1 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86$ */ #if defined(__GNUC__) #if defined(linux) && (defined(__alpha__) || defined(__ia64__)) @@ -438,13 +438,13 @@ void outl(U16_t, U32_t); # define __USLC__ # endif # endif -#ifndef SCO325 -# include <sys/inline.h> -#else -# include "../common/scoasm.h" -#endif -#define intr_disable() asm("cli") -#define intr_enable() asm("sti") +# ifndef __SCO__ +# include <sys/inline.h> +# else +# include "../common/scoasm.h" +# endif +# define intr_disable() asm("cli") +# define intr_enable() asm("sti") #endif /* _MINIX and _ACK */ #endif /* __GNUC__ */ |