Commit 29401f29 authored by Mike Gabriel's avatar Mike Gabriel Committed by Mihai Moldovan

drop platform support: unifdef DGUX.

Relates to ArcticaProject/nx-libs#275.
parent 0a9f9a95
...@@ -592,7 +592,7 @@ ...@@ -592,7 +592,7 @@
# endif # endif
#endif /* MOTOROLA */ #endif /* MOTOROLA */
#if defined(SVR4) && !defined(DGUX) #if defined(SVR4)
# ifdef i386 # ifdef i386
# define i386Architecture # define i386Architecture
# undef i386 # undef i386
...@@ -685,15 +685,6 @@ ...@@ -685,15 +685,6 @@
# endif /* ! SVR4 */ # endif /* ! SVR4 */
#endif /* SYSV386 */ #endif /* SYSV386 */
#ifdef DGUX
# define i386Architecture
# define SVR4Architecture
# define MacroIncludeFile <DGUX.cf>
# define MacroFile DGUX.cf
# undef DGUX
# define DguxArchitecture
#endif /* DGUX */
#ifdef __convex__ #ifdef __convex__
# define MacroIncludeFile <convex.cf> # define MacroIncludeFile <convex.cf>
# define MacroFile convex.cf # define MacroFile convex.cf
......
...@@ -79,22 +79,17 @@ from The Open Group. ...@@ -79,22 +79,17 @@ from The Open Group.
/* Below is the monster branch from hell. Basically, most systems will drop to /* 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 * 'the branch below is the fallthrough for halfway modern systems', and include
* <sys/select.h>, so we get the FD_* macros. */ * <sys/select.h>, so we get the FD_* macros. */
#if !defined(DGUX)
# if defined(SVR4) && !defined(FD_SETSIZE) #if defined(SVR4) && !defined(FD_SETSIZE)
# include <sys/select.h> # include <sys/select.h>
# ifdef luna # ifdef luna
# include <sysent.h> # include <sysent.h>
# endif # endif
# else /* not SVR4 */ #else /* not SVR4 */
# ifdef __QNX__ /* Make sure we get 256 bit select masks */ # ifdef __QNX__ /* Make sure we get 256 bit select masks */
# define FD_SETSIZE 256 # define FD_SETSIZE 256
# endif
# include <sys/select.h>
# endif # endif
#else /* DGUX -- No sys/select in Intel DG/ux */ # include <sys/select.h>
# include <sys/time.h>
# include <sys/types.h>
# include <unistd.h>
#endif #endif
#include <nx-X11/Xmd.h> #include <nx-X11/Xmd.h>
......
...@@ -91,20 +91,6 @@ SOFTWARE. ...@@ -91,20 +91,6 @@ SOFTWARE.
# endif # endif
#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) #if defined(QNX4)
# include <sys/utsname.h> # include <sys/utsname.h>
# ifdef HAS_IFREQ # ifdef HAS_IFREQ
...@@ -307,7 +293,7 @@ AccessUsingXdmcp (void) ...@@ -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 */ /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */
...@@ -356,9 +342,9 @@ ifioctl (int fd, int cmd, char *arg) ...@@ -356,9 +342,9 @@ ifioctl (int fd, int cmd, char *arg)
#endif #endif
return(ret); return(ret);
} }
#else /* Case DGUX, sun, SCO325 NCR and others */ #else /* Case sun, SCO325 NCR and others */
#define ifioctl ioctl #define ifioctl ioctl
#endif /* ((SVR4 && !DGUX !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */ #endif /* ((SVR4 && !sun !SCO325 !NCR) || ISC) && SIOCGIFCONF */
/* /*
* DefineSelf (fd): * DefineSelf (fd):
......
...@@ -82,18 +82,6 @@ SOFTWARE. ...@@ -82,18 +82,6 @@ SOFTWARE.
#ifndef WIN32 #ifndef WIN32
#include <sys/socket.h> #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) #if defined(TCPCONN)
# include <netinet/in.h> # include <netinet/in.h>
# include <arpa/inet.h> # include <arpa/inet.h>
......
...@@ -51,11 +51,6 @@ from The Open Group. ...@@ -51,11 +51,6 @@ from The Open Group.
extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
#endif #endif
#if defined(DGUX)
#include <time.h>
#include <rpc/auth_des.h>
#endif /* DGUX */
#ifdef ultrix #ifdef ultrix
#include <time.h> #include <time.h>
#include <rpc/auth_des.h> #include <rpc/auth_des.h>
......
...@@ -124,11 +124,6 @@ OR PERFORMANCE OF THIS SOFTWARE. ...@@ -124,11 +124,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>
#if defined(DGUX)
#include <sys/resource.h>
#include <netdb.h>
#endif
#include <stdlib.h> /* for malloc() */ #include <stdlib.h> /* for malloc() */
#if defined(TCPCONN) #if defined(TCPCONN)
...@@ -318,11 +313,6 @@ OsSignal(sig, handler) ...@@ -318,11 +313,6 @@ OsSignal(sig, handler)
#define LOCK_PREFIX "/.X" #define LOCK_PREFIX "/.X"
#define LOCK_SUFFIX "-lock" #define LOCK_SUFFIX "-lock"
#if defined(DGUX)
#include <limits.h>
#include <sys/param.h>
#endif
#ifndef PATH_MAX #ifndef PATH_MAX
#include <sys/param.h> #include <sys/param.h>
#ifndef PATH_MAX #ifndef PATH_MAX
......
...@@ -45,11 +45,6 @@ ...@@ -45,11 +45,6 @@
#include "dixstruct.h" #include "dixstruct.h"
#include "opaque.h" #include "opaque.h"
#if defined(DGUX)
#include <net/net_ioctl.h>
#include <sys/ioctl.h>
#endif
#ifndef NX_TRANS_SOCKET #ifndef NX_TRANS_SOCKET
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment