From 8c1a21b4568f50a1fbbe014ee744d7130754d2ed Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 22:03:39 +0100 Subject: drop platform support: unifdef sgi. Relates to ArcticaProject/nx-libs#275. --- nx-X11/programs/Xserver/Imakefile | 2 +- nx-X11/programs/Xserver/dix/devices.c | 6 ------ nx-X11/programs/Xserver/fb/fb.h | 3 +-- nx-X11/programs/Xserver/hw/nxagent/Args.c | 6 ------ nx-X11/programs/Xserver/include/servermd.h | 10 +--------- nx-X11/programs/Xserver/mi/micoord.h | 2 +- nx-X11/programs/Xserver/os/access.c | 2 +- nx-X11/programs/Xserver/os/osdep.h | 2 -- nx-X11/programs/Xserver/os/utils.c | 7 ------- nx-X11/programs/Xserver/render/picture.h | 3 +-- nx-X11/programs/Xserver/xkb/Imakefile | 6 +----- nx-X11/programs/Xserver/xkb/ddxLoad.c | 2 +- nx-X11/programs/Xserver/xkb/xkbInit.c | 8 -------- 13 files changed, 8 insertions(+), 51 deletions(-) (limited to 'nx-X11/programs/Xserver') diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index ddce93127..fe70d007a 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -160,7 +160,7 @@ INSTPGMFLAGS = #if HasPam && HasPamMisc PAMLIBS = PamLibraries PamMiscLibraries #endif -#if !(SystemV4 || defined(SGIArchitecture) || UseRgbTxt) +#if !(SystemV4 || UseRgbTxt) DBMLIBS = DBMLibrary #endif SYSLIBS = $(ZLIB) MathLibrary $(DBMLIBS) $(USB) \ diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 69cdc82e1..ad1788277 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -662,13 +662,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc) if (!feedc) return FALSE; feedc->CtrlProc = controlProc; -#ifdef sgi - feedc->ctrl.num = 1; - feedc->ctrl.den = 1; - feedc->ctrl.threshold = 1; -#else feedc->ctrl = defaultPointerControl; -#endif feedc->ctrl.id = 0; if ( (feedc->next = dev->ptrfeed) ) feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1; diff --git a/nx-X11/programs/Xserver/fb/fb.h b/nx-X11/programs/Xserver/fb/fb.h index 7c33562b4..58aa8561b 100644 --- a/nx-X11/programs/Xserver/fb/fb.h +++ b/nx-X11/programs/Xserver/fb/fb.h @@ -104,8 +104,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/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 4dbb003f2..46e01c737 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -587,12 +587,6 @@ int ddxProcessArgument(int argc, char *argv[], int i) if(++i < argc) { - #ifdef sgi - - userdefinedfontpath = 1; - - #endif - #ifdef TEST fprintf(stderr, "ddxProcessArgument: User defined font path [%s].\n", argv[i]); #endif diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h index 7e4412e15..04cd97bb8 100644 --- a/nx-X11/programs/Xserver/include/servermd.h +++ b/nx-X11/programs/Xserver/include/servermd.h @@ -192,7 +192,7 @@ SOFTWARE. #endif /* macII */ -#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 */ @@ -344,14 +344,6 @@ SOFTWARE. #endif /* linux/m68k */ -#ifdef sgi - -#define IMAGE_BYTE_ORDER MSBFirst -#define BITMAP_BIT_ORDER MSBFirst -#define GLYPHPADBYTES 4 - -#endif - /* linux on the Compaq Itsy */ #if defined(linux) && defined(__arm__) #define IMAGE_BYTE_ORDER LSBFirst diff --git a/nx-X11/programs/Xserver/mi/micoord.h b/nx-X11/programs/Xserver/mi/micoord.h index b3d725b73..3e45cfede 100644 --- a/nx-X11/programs/Xserver/mi/micoord.h +++ b/nx-X11/programs/Xserver/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) || \ diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c index c04e9c7a0..d3a18efbe 100644 --- a/nx-X11/programs/Xserver/os/access.c +++ b/nx-X11/programs/Xserver/os/access.c @@ -286,7 +286,7 @@ AccessUsingXdmcp (void) } -#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ diff --git a/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h index 3babab3e1..f0e8b707b 100644 --- a/nx-X11/programs/Xserver/os/osdep.h +++ b/nx-X11/programs/Xserver/os/osdep.h @@ -61,7 +61,6 @@ SOFTWARE. #include -#ifndef sgi /* SGI defines OPEN_MAX in a useless way */ #ifndef X_NOT_POSIX #ifdef _POSIX_SOURCE #include @@ -77,7 +76,6 @@ SOFTWARE. #undef _POSIX_ #endif #endif /* X_NOT_POSIX */ -#endif #ifndef OPEN_MAX #ifdef SVR4 diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 6e5482fc1..5f7542a2d 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -269,10 +269,6 @@ long Memory_fail = 0; #include /* for random() */ #endif -#ifdef sgi -int userdefinedfontpath = 0; -#endif /* sgi */ - char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ extern char dispatchExceptionAtReset; @@ -831,9 +827,6 @@ ProcessCommandLine(int argc, char *argv[]) { if(++i < argc) { -#ifdef sgi - userdefinedfontpath = 1; -#endif /* sgi */ defaultFontPath = argv[i]; } else diff --git a/nx-X11/programs/Xserver/render/picture.h b/nx-X11/programs/Xserver/render/picture.h index b09d9aac2..6f3f2d832 100644 --- a/nx-X11/programs/Xserver/render/picture.h +++ b/nx-X11/programs/Xserver/render/picture.h @@ -173,8 +173,7 @@ typedef __int64 xFixed_32_32; defined(ia64) || defined(__ia64__) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(amd64) || defined (__amd64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) + defined(amd64) || defined (__amd64__) typedef long xFixed_32_32; # else # if defined(__GNUC__) && \ diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index 07d715301..89e042212 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -1,10 +1,6 @@ #define SGIHyperOpt #include -#ifdef SGIArchitecture -EXTRA_ALLOC_DEFINES = -DFORCE_ALLOCA -#endif - #if BuildXInputExt XKBXI_SRCS = xkbPrOtherEv.c XKBXI_OBJS = xkbPrOtherEv.o @@ -48,7 +44,7 @@ XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) `pkg-config --cflags-only-I pixman-1` LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln -DEFINES = $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) $(NX_DEFINES) +DEFINES = $(XKB_DDXDEFS) $(NX_DEFINES) XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE) NormalLibraryObjectRule() diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index ef32a4642..4934d266c 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -53,7 +53,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include "xkb.h" -#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(__GNU__) +#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__) #include #endif diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index 10260bf83..1f4bc34b4 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -54,13 +54,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(ultrix) || defined(__alpha) || defined(__alpha__) #define LED_COMPOSE 2 #define LED_CAPS 3 @@ -81,7 +74,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