diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 19:20:13 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:13 +0100 |
| commit | 19edfab7857c158b0925a373531680be78879a61 (patch) | |
| tree | 5d1d64b1f5e4a829a2a5ef37e94ec092f2b9918f /nx-X11/include | |
| parent | 0f9a11a94b5fb52b5f1f9c79a93c54fc6396cab8 (diff) | |
| download | nx-libs-19edfab7857c158b0925a373531680be78879a61.tar.gz nx-libs-19edfab7857c158b0925a373531680be78879a61.tar.bz2 nx-libs-19edfab7857c158b0925a373531680be78879a61.zip | |
drop platform support: unifdef Lynx.
Fixes ArcticaProject/nx-libs#272.
Diffstat (limited to 'nx-X11/include')
| -rw-r--r-- | nx-X11/include/Xarch.h | 16 | ||||
| -rw-r--r-- | nx-X11/include/Xos.h | 2 | ||||
| -rw-r--r-- | nx-X11/include/Xos_r.h | 21 |
3 files changed, 5 insertions, 34 deletions
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 <bsd/in.h> -#include <bsd/in_systm.h> -#include <bsd/ip.h> -#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 <sys/isa_defs.h> #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 <time.h> #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 - /***** <pwd.h> 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) |