diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 21:41:57 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-08 22:40:47 +0100 |
commit | 754e48ac009e4ddf452af06ee3451ecaf7946547 (patch) | |
tree | c62bbb12e1c4ac83c5107af2c0a609bda3ccbf63 /nx-X11/programs | |
parent | a9c30796dce587627524ffa886eeef5e73144c46 (diff) | |
download | nx-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/programs')
-rw-r--r-- | nx-X11/programs/Xserver/os/access.c | 20 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/os/connection.c | 12 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/os/rpcauth.c | 5 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 10 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/os/xdmcp.c | 5 |
5 files changed, 3 insertions, 49 deletions
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 |