aboutsummaryrefslogtreecommitdiff
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
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.
-rw-r--r--nx-X11/config/cf/Imake.cf6
-rw-r--r--nx-X11/config/cf/site.def2
-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
-rw-r--r--nx-X11/lib/X11/SetLocale.c4
-rw-r--r--nx-X11/lib/X11/Xaixlcint.h53
-rw-r--r--nx-X11/lib/X11/XlibInt.c2
-rw-r--r--nx-X11/lib/xtrans/Xtrans.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.c5
-rw-r--r--nx-X11/programs/Xserver/include/servermd.h9
-rw-r--r--nx-X11/programs/Xserver/os/connection.c4
-rw-r--r--nx-X11/programs/Xserver/os/utils.c20
-rw-r--r--nx-X11/programs/Xserver/xkb/ddxLoad.c2
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbAccessX.c4
15 files changed, 19 insertions, 125 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 98655ec56..ed4191be6 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -529,7 +529,7 @@
# define StellarArchitecture
#endif /* stellar */
-#if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix)
+#if defined(ibm) || defined(_IBMR2) || defined(ibm032)
# define MacroIncludeFile <ibm.cf>
# define MacroFile ibm.cf
# ifdef ibm
@@ -544,10 +544,6 @@
# undef ibm032
# define RtArchitecture
# endif
-# ifdef aix
-# undef aix
-# define AIXArchitecture
-# endif
# ifdef _IBMR2
# undef _IBMR2
# if (DefaultOSMajorVersion < 5)
diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def
index f5e769278..da4c13793 100644
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -46,7 +46,7 @@
* the two following macros need to be defined directly (where "X11" is
* really whatever the TopLevelProject macro is defined to be).
*/
-# if defined(AIXArchitecture) || defined(SVR4Architecture) || \
+# if defined(SVR4Architecture) || \
defined(SCOArchitecture) || defined(Win32Architecture) || \
defined(UXPArchitecture) || defined(SunArchitecture) || \
defined(DynixPtxArchitecture) || defined(i386IscArchitecture)
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>
diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c
index 832976ee3..4ceed03a9 100644
--- a/nx-X11/lib/X11/SetLocale.c
+++ b/nx-X11/lib/X11/SetLocale.c
@@ -102,7 +102,7 @@ _XlcMapOSLocaleName(
/* FIXME: correct indentation levels after ancient platform clean-up */
-#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(linux)
+#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(ultrix) || defined(WIN32) || defined(linux)
# ifdef ultrix
# define SKIPCOUNT 2
# define STARTCHAR '\001'
@@ -114,7 +114,7 @@ _XlcMapOSLocaleName(
# define ENDCHAR ';'
# define WHITEFILL
# else
-# if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4))
+# if defined(__osf__)
# define STARTCHAR ' '
# define ENDCHAR ' '
# else
diff --git a/nx-X11/lib/X11/Xaixlcint.h b/nx-X11/lib/X11/Xaixlcint.h
deleted file mode 100644
index 446ba2581..000000000
--- a/nx-X11/lib/X11/Xaixlcint.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Copyright IBM Corporation 1993
- *
- * All Rights Reserved
- *
- * License to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of IBM not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS, AND
- * NONINFRINGEMENT OF THIRD PARTY RIGHTS, IN NO EVENT SHALL
- * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
-*/
-/************************************************************************/
-/* Xaixlcint.h */
-/*----------------------------------------------------------------------*/
-/* This file contains Xlcint.h extension for AIX. */
-/************************************************************************/
-#ifndef _Xaixlcint_h
-#define _Xaixlcint_h
-
-#include "Xlcint.h"
-#include <sys/lc_core.h>
-
-#define _LC_LDX 11
-#define _LC_LDX_R6 (_LC_LDX+1)
-#define _LC_VERSION_R5 5
-#define _LC_VERSION_R6 6
-
-typedef struct _LC_core_ldx_t {
- _LC_object_t lc_object_header;
- XLCd (*default_loader)();
- Bool sticky;
-} _XlcCoreObjRec, *_XlcCoreObj;
-
-#if _LC_VERSION < 0x40000000
-#define __type_id type_id
-#define __magic magic
-#define __version version
-#endif
-
-#endif /*_Xaixlcint_h*/
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index bece819cf..acf766465 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -3891,7 +3891,7 @@ _XData32(
* and so, you may be better off using gethostname (if it exists).
*/
-#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(SVR4)
+#if (defined(_POSIX_SOURCE) && !defined(__QNX__)) || defined(SVR4)
#define NEED_UTSNAME
#include <sys/utsname.h>
#else
diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c
index 637c419a2..328a970b1 100644
--- a/nx-X11/lib/xtrans/Xtrans.c
+++ b/nx-X11/lib/xtrans/Xtrans.c
@@ -669,7 +669,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
#else
ret = fcntl (fd, F_SETFL, ret | O_NDELAY);
#endif
-#endif /* AIXV3 || uniosu */
+#endif /* WIN32 */
#endif /* FIOSNBIO */
#endif /* O_NONBLOCK */
break;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index c492378a0..218766e06 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -536,11 +536,6 @@ void OsVendorEndRedirectErrorFFunction()
nxagentEndRedirectToClientsLog();
}
-/* this is just to get the server to link on AIX */
-#ifdef AIXV3
-int SelectWaitTime = 10000; /* usec */
-#endif
-
ServerGrabInfoRec nxagentGrabServerInfo;
static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data,
diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h
index 5d26c3f7d..78d7c5672 100644
--- a/nx-X11/programs/Xserver/include/servermd.h
+++ b/nx-X11/programs/Xserver/include/servermd.h
@@ -159,15 +159,6 @@ SOFTWARE.
#endif /* sun && !(i386 && SVR4) */
-
-#if defined(AIXV3)
-
-#define IMAGE_BYTE_ORDER MSBFirst /* Values for the RISC/6000 */
-#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 4
-
-#endif /* AIXV3 */
-
#if defined(ibm032) || defined (ibm)
#ifdef i386
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index 60bcc6bb8..f2172e0ad 100644
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -94,10 +94,6 @@ SOFTWARE.
#endif
-#ifdef AIXV3
-#include <sys/ioctl.h>
-#endif
-
#if defined(TCPCONN)
# include <netinet/in.h>
# include <arpa/inet.h>
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 5070eea8d..a6a42261c 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -264,11 +264,6 @@ int auditTrailLevel = 1;
Bool Must_have_memory = FALSE;
-#ifdef AIXV3
-int SyncOn = 0;
-extern int SelectWaitTime;
-#endif
-
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
#define HAS_SAVED_IDS_AND_SETEUID
#endif
@@ -571,7 +566,6 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay)
void UseMsg(void)
{
-#if !defined(AIXrt) && !defined(AIX386)
ErrorF("use: X [:<display>] [option]\n");
ErrorF("-a # mouse acceleration (pixels)\n");
ErrorF("-ac disable access control restrictions\n");
@@ -664,7 +658,6 @@ void UseMsg(void)
#ifdef XDMCP
XdmcpUseMsg();
#endif
-#endif /* !AIXrt && ! AIX386 */
#ifdef XKB
XkbUseMsg();
#endif
@@ -1062,19 +1055,6 @@ ProcessCommandLine(int argc, char *argv[])
i = skip - 1;
}
#endif
-#ifdef AIXV3
- else if ( strcmp( argv[i], "-timeout") == 0)
- {
- if(++i < argc)
- SelectWaitTime = atoi(argv[i]);
- else
- UseMsg();
- }
- else if ( strcmp( argv[i], "-sync") == 0)
- {
- SyncOn++;
- }
-#endif
#ifdef SMART_SCHEDULE
else if ( strcmp( argv[i], "-dumbSched") == 0)
{
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 89f777d58..d7b2314c3 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -53,7 +53,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/extensions/XI.h>
#include "xkb.h"
-#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
+#if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(__osf__) || defined(__GNU__)
#include <paths.h>
#endif
diff --git a/nx-X11/programs/Xserver/xkb/xkbAccessX.c b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
index 27e56c05a..a358c6293 100644
--- a/nx-X11/programs/Xserver/xkb/xkbAccessX.c
+++ b/nx-X11/programs/Xserver/xkb/xkbAccessX.c
@@ -360,9 +360,7 @@ XkbControlsPtr ctrls;
if (keybd->kbdfeed->ctrl.autoRepeat &&
((xkbi->slowKey != xkbi->mouseKey) || (!xkbi->mouseKeysAccel)) &&
(ctrls->enabled_ctrls&XkbRepeatKeysMask)) {
-#ifndef AIXV3
if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,xkbi->slowKey))
-#endif
{
xkbi->repeatKey = xkbi->slowKey;
xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
@@ -529,9 +527,7 @@ KeySym * sym = XkbKeySymsPtr(xkbi->desc,key);
if ((keybd->kbdfeed->ctrl.autoRepeat) &&
((ctrls->enabled_ctrls&(XkbSlowKeysMask|XkbRepeatKeysMask))==
XkbRepeatKeysMask)) {
-#ifndef AIXV3
if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key))
-#endif
{
#ifdef DEBUG
if (xkbDebugFlags&0x10)