From 0670f7583d63977cb175ffe11a64061f88c1bf31 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 May 2024 20:39:23 +0200 Subject: Xext,os,xkb: repeat unifdefs there where remnants of WIN32, CYGWIN and SCO --- nx-X11/programs/Xserver/Xext/security.c | 5 ----- nx-X11/programs/Xserver/Xext/shm.c | 2 +- nx-X11/programs/Xserver/Xext/xf86bigfont.c | 8 ++------ 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'nx-X11/programs/Xserver/Xext') diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index df284d6a3..73fe1af85 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -73,11 +73,6 @@ in this Software without prior written authorization from The Open Group. # define DEFAULTPOLICYFILE NULL #endif -#if defined(WIN32) || defined(__CYGWIN__) -#include -#undef index -#endif - static int SecurityErrorBase; /* first Security error number */ static int SecurityEventBase; /* first Security event number */ diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index 868087462..594586f97 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -149,7 +149,7 @@ static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage}; } -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) static Bool badSysCall = FALSE; diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index a31ffd02c..0b946a663 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -51,10 +51,6 @@ #ifdef SVR4 #include #endif -#if defined(__CYGWIN__) || defined(__SCO__) -#include -#include -#endif #include #include #include @@ -110,7 +106,7 @@ static unsigned int pagesize; static Bool badSysCall = FALSE; -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) static void SigSysHandler( @@ -198,7 +194,7 @@ XFree86BigfontExtensionInit() FontShmdescIndex = AllocateFontPrivateIndex(); #endif /* HAS_XFONT2 */ -#if !defined(CSRG_BASED) && !defined(__CYGWIN__) +#if !defined(CSRG_BASED) pagesize = SHMLBA; #else # ifdef _SC_PAGESIZE -- cgit v1.2.3 From a7d2c5abdc8e1573aaec97bcc5912597be61f86c Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 11 May 2024 19:17:37 +0200 Subject: Xext/shape.c: remove one include Patch by realsimix: "Oneliner which was for some old distribution but works on all up to RHEL9." Mentioned in ArcticaProject/nx-libs#1054 --- nx-X11/programs/Xserver/Xext/shape.c | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/Xext') diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 48a3e952d..977254d2b 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -55,7 +55,6 @@ in this Software without prior written authorization from The Open Group. #endif #include "protocol-versions.h" #include "regionstr.h" -#include "gcstruct.h" typedef RegionPtr (*CreateDftPtr)( WindowPtr /* pWin */ -- cgit v1.2.3