aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-15 21:20:22 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:13 +0100
commitcc1350acecb23325096427d1c4947bf8a787304d (patch)
treeddedb8cdee28e6f0c0544b0c56b199d093bb564c /nx-X11/include
parentf6dcf2feb8e0f48811852de7f4148cbf7336db08 (diff)
downloadnx-libs-cc1350acecb23325096427d1c4947bf8a787304d.tar.gz
nx-libs-cc1350acecb23325096427d1c4947bf8a787304d.tar.bz2
nx-libs-cc1350acecb23325096427d1c4947bf8a787304d.zip
drop platform support: unifdef AIXV3, AIXV4 (and AIXrt, AIX386).
Fixes ArcticaProject/nx-libs#274.
Diffstat (limited to 'nx-X11/include')
-rw-r--r--nx-X11/include/Xmd.h2
-rw-r--r--nx-X11/include/Xos_r.h13
-rw-r--r--nx-X11/include/Xpoll.h.in16
3 files changed, 12 insertions, 19 deletions
diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h
index a1e165d4d..8b3af78f6 100644
--- a/nx-X11/include/Xmd.h
+++ b/nx-X11/include/Xmd.h
@@ -100,7 +100,7 @@ typedef long INT32;
#endif
typedef short INT16;
-#if defined(__STDC__) || defined(sgi) || defined(AIXV3)
+#if defined(__STDC__) || defined(sgi)
typedef signed char INT8;
#else
typedef char INT8;
diff --git a/nx-X11/include/Xos_r.h b/nx-X11/include/Xos_r.h
index 138efd704..65dba4b0f 100644
--- a/nx-X11/include/Xos_r.h
+++ b/nx-X11/include/Xos_r.h
@@ -320,7 +320,7 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
(p).pwp )
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) && !defined(__DARWIN__)
-/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */
+/* SVR4 threads and OSF/1 3.2 and earlier pthreads */
# define X_NEEDS_PWPARAMS
typedef struct {
struct passwd pws;
@@ -467,7 +467,7 @@ typedef struct {
*/
# ifdef _POSIX_REENTRANT_FUNCTIONS
# ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-# if defined(AIXV3) || defined(AIXV4) || defined(__osf__)
+# if defined(__osf__)
# define X_POSIX_THREAD_SAFE_FUNCTIONS 1
# endif
# endif
@@ -604,9 +604,8 @@ typedef struct {
# endif
} _Xreaddirparams;
-# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \
- defined(AIXV4) || defined(__APPLE__) || defined(__DARWIN__)
-/* AIX defines the draft POSIX symbol, but uses the final API. */
+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || \
+ defined(__APPLE__) || defined(__DARWIN__)
/* POSIX final API, returns (int)0 on success. */
# if defined(__osf__)
/* OSF/1 V4.0 <dirent.h> doesn't declare _Preaddir_r, breaking under C++. */
@@ -972,7 +971,7 @@ typedef struct tm _Xltimeparams;
# define _XLocaltime(t,p) localtime_r((t),&(p))
#else /* defined(_POSIX_THREAD_SAFE_FUNCTIONS) */
-/* POSIX final API. OSF/1 v4.0, AIX, etc.
+/* POSIX final API. OSF/1 v4.0, etc.
*
* extern char *asctime_r(const struct tm *timeptr, char *buffer);
* extern char *ctime_r(const time_t *timer, char *buffer);
@@ -1093,7 +1092,7 @@ typedef struct {
#define _XGetgrnam(n,p) getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf))
#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-/* Non-POSIX API. HP/UX 10, AIX 4.
+/* Non-POSIX API. HP/UX 10.
*
* extern int getgrgid_r(gid_t, struct group *, char *, int);
* extern int getgrnam_r(const char *, struct group *, char *, int);
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index 4d720a742..c487e0af2 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -80,22 +80,16 @@ from The Open Group.
* 'the branch below is the fallthrough for halfway modern systems', and include
* <sys/select.h>, so we get the FD_* macros. */
#if !defined(DGUX)
-# if (defined(SVR4) || defined(AIXV3)) && !defined(FD_SETSIZE)
+# if defined(SVR4) && !defined(FD_SETSIZE)
# include <sys/select.h>
# ifdef luna
# include <sysent.h>
# endif
-# else /* not SVR4/AIXv3 */
-# if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */
-# if !defined(NFDBITS)
-# include <sys/select.h>
-# endif
-# else /* the branch below is the fallthrough for halfway modern systems */
-# ifdef __QNX__ /* Make sure we get 256 bit select masks */
-# define FD_SETSIZE 256
-# endif
-# include <sys/select.h>
+# else /* not SVR4 */
+# ifdef __QNX__ /* Make sure we get 256 bit select masks */
+# define FD_SETSIZE 256
# endif
+# include <sys/select.h>
# endif
#else /* DGUX -- No sys/select in Intel DG/ux */
# include <sys/time.h>