diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
| commit | 0a314adfa63669155299c77e479ed68c349643bd (patch) | |
| tree | 6c5f9776e63ed48109714fd5c70e2cca37661c60 /nx-X11/programs/Xserver/Xext | |
| parent | 86a6a340f06e7a735b92ca2923d2ebc6183de546 (diff) | |
| parent | 029bae127dabb92f6e50a3b07d51f4921986efb0 (diff) | |
| download | nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.gz nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.bz2 nx-libs-0a314adfa63669155299c77e479ed68c349643bd.zip | |
Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x
Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/security.c | 20 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shm.c | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/sync.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvmc.c | 5 |
4 files changed, 1 insertions, 31 deletions
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 6883db5f8..3a638460e 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -1481,11 +1481,7 @@ SecurityFreePropertyAccessList(void) } } /* SecurityFreePropertyAccessList */ -#ifndef __UNIXOS2__ #define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') ) -#else -#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') ) -#endif static char * SecuritySkipWhitespace( @@ -1774,8 +1770,6 @@ SecurityLoadPropertyAccessList(void) #endif -#ifndef __UNIXOS2__ - #ifdef NXAGENT_SERVER f = Fopen(_NXGetPolicyFilePath(SecurityPolicyFile), "r"); @@ -1786,20 +1780,6 @@ SecurityLoadPropertyAccessList(void) #endif -#else - -#ifdef NXAGENT_SERVER - - f = Fopen((char*)__XOS2RedirRoot( _NXGetPolicyFilePath(SecurityPolicyFile)), "r"); - -#else - - f = Fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r"); - -#endif - -#endif - if (!f) { #ifdef NXAGENT_SERVER diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index c70f52b6a..dc8bbf97b 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -34,13 +34,8 @@ in this Software without prior written authorization from The Open Group. #endif #include <sys/types.h> -#ifndef Lynx #include <sys/ipc.h> #include <sys/shm.h> -#else -#include <ipc.h> -#include <shm.h> -#endif #include <unistd.h> #include <sys/stat.h> #include <nx-X11/X.h> diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 4f24d5b54..e1580b3a3 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -71,7 +71,7 @@ PERFORMANCE OF THIS SOFTWARE. #include "protocol-versions.h" #include <stdio.h> -#if !defined(WIN32) && !defined(Lynx) +#if !defined(WIN32) #include <sys/time.h> #endif diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c index 710101d07..0a43baa22 100644 --- a/nx-X11/programs/Xserver/Xext/xvmc.c +++ b/nx-X11/programs/Xserver/Xext/xvmc.c @@ -22,14 +22,9 @@ #include "xvmcext.h" #ifdef HAS_XVMCSHM -#ifndef Lynx #include <sys/ipc.h> #include <sys/types.h> #include <sys/shm.h> -#else -#include <ipc.h> -#include <shm.h> -#endif /* Lynx */ #endif /* HAS_XVMCSHM */ |