From 4b178918ba19ebd9daa6f87fa790b6f6767b1f61 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 15 Nov 2016 21:20:22 +0100
Subject: drop platform support: unifdef AIXV3, AIXV4 (and AIXrt, AIX386).

 Fixes ArcticaProject/nx-libs#274.
---
 nx-X11/lib/X11/SetLocale.c |  4 ++--
 nx-X11/lib/X11/Xaixlcint.h | 53 ----------------------------------------------
 nx-X11/lib/X11/XlibInt.c   |  2 +-
 nx-X11/lib/xtrans/Xtrans.c |  2 +-
 4 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 nx-X11/lib/X11/Xaixlcint.h

(limited to 'nx-X11/lib')

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;
-- 
cgit v1.2.3