aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os
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/programs/Xserver/os
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/programs/Xserver/os')
-rw-r--r--nx-X11/programs/Xserver/os/connection.c4
-rw-r--r--nx-X11/programs/Xserver/os/utils.c20
2 files changed, 0 insertions, 24 deletions
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)
{