From ace255eda62081526b721e82ed0339c566975ad3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 15 Nov 2016 19:20:13 +0100 Subject: drop platform support: unifdef Lynx. Fixes ArcticaProject/nx-libs#272. --- nx-X11/include/Xarch.h | 16 +--------------- nx-X11/include/Xos.h | 2 +- nx-X11/include/Xos_r.h | 21 +++------------------ 3 files changed, 5 insertions(+), 34 deletions(-) (limited to 'nx-X11/include') diff --git a/nx-X11/include/Xarch.h b/nx-X11/include/Xarch.h index 94a673d1f..d68b0493a 100644 --- a/nx-X11/include/Xarch.h +++ b/nx-X11/include/Xarch.h @@ -73,13 +73,6 @@ #if !defined(BYTE_ORDER) && defined(__BYTE_ORDER) #define BYTE_ORDER __BYTE_ORDER #endif -#elif defined(Lynx) -#if 0 -/* LynxOS 2.4.0 has wrong defines in bsd/ip.h */ -#include -#include -#include -#endif #endif #ifndef BYTE_ORDER @@ -98,14 +91,7 @@ #endif #endif -#ifdef Lynx -#if defined(i386) || defined(__i386__) || defined(__x86__) -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN -#endif -#endif -#if (defined(sun) && defined(SVR4)) && !defined(Lynx) +#if (defined(sun) && defined(SVR4)) #include #ifdef _LITTLE_ENDIAN #define BYTE_ORDER LITTLE_ENDIAN diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h index 10b3a225f..8a7fface1 100644 --- a/nx-X11/include/Xos.h +++ b/nx-X11/include/Xos.h @@ -219,7 +219,7 @@ struct timeval { (t)->tv_sec = _gtodtmp.time; \ (t)->tv_usec = _gtodtmp.millitm * 1000; \ } -#elif defined(_SEQUENT_) || defined(Lynx) +#elif defined(_SEQUENT_) #include #elif defined (__QNX__) typedef unsigned long fd_mask; diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h index bafbefcb3..44a3690ba 100644 --- a/nx-X11/include/Xos_r.h +++ b/nx-X11/include/Xos_r.h @@ -197,14 +197,6 @@ extern void XtProcessUnlock( # undef _POSIX_THREAD_SAFE_FUNCTIONS #endif -/* - * LynxOS 3.1 defines _POSIX_THREAD_SAFE_FUNCTIONS but - * getpwuid_r has different semantics than defined by POSIX - */ -#if defined(Lynx) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) -# undef _POSIX_THREAD_SAFE_FUNCTIONS -#endif - /***** wrappers *****/ @@ -334,18 +326,11 @@ typedef struct { struct passwd pws; char pwbuf[X_LINE_MAX]; } _Xgetpwparams; -# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx) -# ifndef Lynx -# define _XGetpwuid(u,p) \ +# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) +# define _XGetpwuid(u,p) \ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# define _XGetpwnam(u,p) \ +# define _XGetpwnam(u,p) \ ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# else /* Lynx */ -# define _XGetpwuid(u,p) \ -((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# define _XGetpwnam(u,p) \ -((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# endif # else /* SVR4 */ # define _XGetpwuid(u,p) \ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws) -- cgit v1.2.3