aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-15 21:41:57 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-08 22:40:47 +0100
commit754e48ac009e4ddf452af06ee3451ecaf7946547 (patch)
treec62bbb12e1c4ac83c5107af2c0a609bda3ccbf63 /nx-X11
parenta9c30796dce587627524ffa886eeef5e73144c46 (diff)
downloadnx-libs-754e48ac009e4ddf452af06ee3451ecaf7946547.tar.gz
nx-libs-754e48ac009e4ddf452af06ee3451ecaf7946547.tar.bz2
nx-libs-754e48ac009e4ddf452af06ee3451ecaf7946547.zip
drop platform support: unifdef DGUX.
Relates to ArcticaProject/nx-libs#275.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/config/cf/Imake.cf11
-rw-r--r--nx-X11/include/Xpoll.h.in25
-rw-r--r--nx-X11/programs/Xserver/os/access.c20
-rw-r--r--nx-X11/programs/Xserver/os/connection.c12
-rw-r--r--nx-X11/programs/Xserver/os/rpcauth.c5
-rw-r--r--nx-X11/programs/Xserver/os/utils.c10
-rw-r--r--nx-X11/programs/Xserver/os/xdmcp.c5
7 files changed, 14 insertions, 74 deletions
diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 5ff2ee16b..086d9d0eb 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -592,7 +592,7 @@
# endif
#endif /* MOTOROLA */
-#if defined(SVR4) && !defined(DGUX)
+#if defined(SVR4)
# ifdef i386
# define i386Architecture
# undef i386
@@ -685,15 +685,6 @@
# endif /* ! SVR4 */
#endif /* SYSV386 */
-#ifdef DGUX
-# define i386Architecture
-# define SVR4Architecture
-# define MacroIncludeFile <DGUX.cf>
-# define MacroFile DGUX.cf
-# undef DGUX
-# define DguxArchitecture
-#endif /* DGUX */
-
#ifdef __convex__
# define MacroIncludeFile <convex.cf>
# define MacroFile convex.cf
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index c487e0af2..3ad5d0669 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -79,22 +79,17 @@ from The Open Group.
/* Below is the monster branch from hell. Basically, most systems will drop to
* '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(FD_SETSIZE)
-# include <sys/select.h>
-# ifdef luna
-# include <sysent.h>
-# endif
-# else /* not SVR4 */
-# ifdef __QNX__ /* Make sure we get 256 bit select masks */
-# define FD_SETSIZE 256
-# endif
-# include <sys/select.h>
+
+#if defined(SVR4) && !defined(FD_SETSIZE)
+# include <sys/select.h>
+# ifdef luna
+# include <sysent.h>
+# endif
+#else /* not SVR4 */
+# ifdef __QNX__ /* Make sure we get 256 bit select masks */
+# define FD_SETSIZE 256
# endif
-#else /* DGUX -- No sys/select in Intel DG/ux */
-# include <sys/time.h>
-# include <sys/types.h>
-# include <unistd.h>
+# include <sys/select.h>
#endif
#include <nx-X11/Xmd.h>
diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c
index de81c5141..e45645cda 100644
--- a/nx-X11/programs/Xserver/os/access.c
+++ b/nx-X11/programs/Xserver/os/access.c
@@ -91,20 +91,6 @@ SOFTWARE.
# endif
#endif
-#if defined(DGUX)
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <ctype.h>
-#include <sys/utsname.h>
-#include <sys/stream.h>
-#include <sys/stropts.h>
-#include <sys/param.h>
-#include <sys/sockio.h>
-#endif
-
-
#if defined(QNX4)
# include <sys/utsname.h>
# ifdef HAS_IFREQ
@@ -307,7 +293,7 @@ AccessUsingXdmcp (void)
}
-#if ((defined(SVR4) && !defined(DGUX) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF)
+#if ((defined(SVR4) && !defined(SCO325) && !defined(sun) && !defined(NCR)) || defined(ISC)) && !defined(__sgi) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF)
/* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
@@ -356,9 +342,9 @@ ifioctl (int fd, int cmd, char *arg)
#endif
return(ret);
}
-#else /* Case DGUX, sun, SCO325 NCR and others */
+#else /* Case sun, SCO325 NCR and others */
#define ifioctl ioctl
-#endif /* ((SVR4 && !DGUX !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */
+#endif /* ((SVR4 && !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */
/*
* DefineSelf (fd):
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index f2172e0ad..458daab54 100644
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -82,18 +82,6 @@ SOFTWARE.
#ifndef WIN32
#include <sys/socket.h>
-#if defined(DGUX)
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <sys/param.h>
-#include <unistd.h>
-#endif
-
-
#if defined(TCPCONN)
# include <netinet/in.h>
# include <arpa/inet.h>
diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c
index 2a6874f4a..678bedf6c 100644
--- a/nx-X11/programs/Xserver/os/rpcauth.c
+++ b/nx-X11/programs/Xserver/os/rpcauth.c
@@ -51,11 +51,6 @@ from The Open Group.
extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
#endif
-#if defined(DGUX)
-#include <time.h>
-#include <rpc/auth_des.h>
-#endif /* DGUX */
-
#ifdef ultrix
#include <time.h>
#include <rpc/auth_des.h>
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index a6a42261c..540de2835 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -124,11 +124,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <grp.h>
#include <pwd.h>
-#if defined(DGUX)
-#include <sys/resource.h>
-#include <netdb.h>
-#endif
-
#include <stdlib.h> /* for malloc() */
#if defined(TCPCONN)
@@ -318,11 +313,6 @@ OsSignal(sig, handler)
#define LOCK_PREFIX "/.X"
#define LOCK_SUFFIX "-lock"
-#if defined(DGUX)
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
#ifndef PATH_MAX
#include <sys/param.h>
#ifndef PATH_MAX
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index 31f013296..83e234b43 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -45,11 +45,6 @@
#include "dixstruct.h"
#include "opaque.h"
-#if defined(DGUX)
-#include <net/net_ioctl.h>
-#include <sys/ioctl.h>
-#endif
-
#ifndef NX_TRANS_SOCKET