From 856db05b58b71c5ff22af727aba435a8c356abfa Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 23 Jul 2008 13:25:37 -0400 Subject: Unifdef sgi. --- fb/fb.h | 3 +-- hw/dmx/dmxinit.c | 10 +--------- hw/xfree86/common/compiler.h | 4 ++-- hw/xfree86/common/xf86Events.c | 2 +- hw/xfree86/os-support/xf86_OSlib.h | 9 +-------- hw/xfree86/x86emu/x86emu/types.h | 5 ++--- include/servermd.h | 9 +-------- mi/micoord.h | 2 +- os/access.c | 2 +- os/osdep.h | 2 -- xkb/ddxLoad.c | 2 +- xkb/xkbInit.c | 8 -------- 12 files changed, 12 insertions(+), 46 deletions(-) diff --git a/fb/fb.h b/fb/fb.h index 9d514b4ab..2bb88e3f3 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -139,8 +139,7 @@ typedef unsigned __int64 FbBits; defined(__sparc64__) || defined(_LP64) || \ defined(__s390x__) || \ defined(amd64) || defined (__amd64__) \ - defined (__powerpc64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) + defined (__powerpc64__) typedef unsigned long FbBits; # else typedef unsigned long long FbBits; diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 760fccf72..6a0c259ec 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -508,7 +508,7 @@ static void dmxDisplayInit(DMXScreenInfo *dmxScreen) /* If this doesn't compile, just add || defined(yoursystem) to the line * below. This information is to help with bug reports and is not * critical. */ -#if !defined(_POSIX_SOURCE) && !defined(__sgi) +#if !defined(_POSIX_SOURCE) static const char *dmxExecOS(void) { return ""; } #else #include @@ -538,14 +538,6 @@ static const char *dmxBuildCompiler(void) #if defined(__GNUC__) && defined(__GNUC_MINOR__) &&defined(__GNUC_PATCHLEVEL__) XmuSnprintf(buffer, sizeof(buffer)-1, "gcc %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__); -#elif defined(__sgi) && defined(_COMPILER_VERSION) && !defined(__GNUC__) - { - int a = _COMPILER_VERSION / 100; - int b = (_COMPILER_VERSION - a * 100) / 10; - int c = _COMPILER_VERSION - a * 100 - b * 10; - XmuSnprintf(buffer, sizeof(buffer)-1, "SGI MIPSpro %d.%d.%d", - a, b, c); - } #endif } return buffer; diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 24f9ae617..886c639a4 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1488,13 +1488,13 @@ inl(unsigned short port) # define uint_t unsigned int # define uchar_t unsigned char # endif /* __UNIXWARE__ */ -# if !defined(sgi) && !defined(__SUNPRO_C) +# if !defined(__SUNPRO_C) # include # endif # else # include "scoasm.h" # endif -# if (!defined(__HIGHC__) && !defined(sgi) && !defined(__SUNPRO_C)) || \ +# if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \ defined(__USLC__) # pragma asm partial_optimization outl # pragma asm partial_optimization outw diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 832de106c..6bc6bbde0 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -277,7 +277,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) CloseDownClient(server); } break; -#if !defined(__SOL8__) && !defined(sgi) && \ +#if !defined(__SOL8__) && \ (!defined(sun) || defined(__i386__)) && defined(VT_ACTIVATE) case ACTION_SWITCHSCREEN: if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 7469d558f..a8340fbee 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -84,7 +84,7 @@ /* SYSV386 (SVR3, SVR4), including Solaris */ /**************************************************************************/ #if (defined(SYSV) || defined(SVR4)) && \ - !defined(DGUX) && !defined(sgi) && \ + !defined(DGUX) && \ (defined(sun) || defined(__i386__)) # ifdef SCO325 # ifndef _SVID3 @@ -479,13 +479,6 @@ /**************************************************************************/ /* IRIX */ /**************************************************************************/ -#if defined(sgi) - -#include -#include -#include - -#endif /**************************************************************************/ /* Generic */ diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h index c0c09c1b0..c18e11cfb 100644 --- a/hw/xfree86/x86emu/x86emu/types.h +++ b/hw/xfree86/x86emu/x86emu/types.h @@ -74,9 +74,8 @@ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64)) || \ - defined(__amd64__) || defined(amd64) || \ - (defined(__sgi) && (_MIPS_SZLONG == 64)) + defined(__hppa__) && defined(__LP64) || \ + defined(__amd64__) || defined(amd64) #define NUM32 int #else #define NUM32 long diff --git a/include/servermd.h b/include/servermd.h index 13414f740..866242609 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -175,7 +175,7 @@ SOFTWARE. #endif /* ibm */ -#if (defined(mips) || defined(__mips)) && !defined(sgi) +#if (defined(mips) || defined(__mips)) #if defined(MIPSEL) || defined(__MIPSEL__) # define IMAGE_BYTE_ORDER LSBFirst /* Values for the PMAX only */ @@ -261,13 +261,6 @@ SOFTWARE. #endif /* linux/m68k */ -#ifdef sgi - -#define IMAGE_BYTE_ORDER MSBFirst -#define BITMAP_BIT_ORDER MSBFirst -#define GLYPHPADBYTES 4 - -#endif /* linux on ARM */ #if defined(linux) && defined(__arm__) diff --git a/mi/micoord.h b/mi/micoord.h index 16d086117..e6d814fc8 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -43,7 +43,7 @@ * forcing as to use div instead of shift. Let's be explicit. */ -#if defined(mips) || defined(sgi) || \ +#if defined(mips) || \ defined(sparc) || defined(__sparc64__) || \ defined(__alpha) || defined(__alpha__) || \ defined(__i386__) || defined(__i386) || defined(__ia64__) || \ diff --git a/os/access.c b/os/access.c index c973cb114..6179d5bd1 100644 --- a/os/access.c +++ b/os/access.c @@ -290,7 +290,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(SCO325) && !defined(sun)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ( defined(SVR4) && !defined(SCO325) && !defined(sun) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ diff --git a/os/osdep.h b/os/osdep.h index 1b8dcf7ad..af1d5a9b4 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -58,7 +58,6 @@ SOFTWARE. #include -#ifndef sgi /* SGI defines OPEN_MAX in a useless way */ #ifdef _POSIX_SOURCE #include #else @@ -66,7 +65,6 @@ SOFTWARE. #include #undef _POSIX_SOURCE #endif -#endif #ifndef OPEN_MAX #ifdef SVR4 diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index d6b5f7589..115f8555f 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -48,7 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "xkb.h" -#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) +#if defined(CSRG_BASED) || defined(linux) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) #include #endif diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 8043f5aa9..9033a1371 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -55,13 +55,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) -#ifdef sgi -#define LED_CAPS 5 -#define LED_NUM 6 -#define LED_SCROLL 7 -#define PHYS_LEDS 0x7f -#define LED_COMPOSE 8 -#else #if defined(__osf__) || defined(__alpha) || defined(__alpha__) #define LED_COMPOSE 2 #define LED_CAPS 3 @@ -82,7 +75,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define PHYS_LEDS 0x07 #endif #endif -#endif #define MAX_TOC 16 typedef struct _SrvXkmInfo { -- cgit v1.2.3