Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
754e48ac
Commit
754e48ac
authored
Nov 15, 2016
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drop platform support: unifdef DGUX.
Relates to ArcticaProject/nx-libs#275.
parent
a9c30796
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
74 deletions
+14
-74
Imake.cf
nx-X11/config/cf/Imake.cf
+1
-10
Xpoll.h.in
nx-X11/include/Xpoll.h.in
+10
-15
access.c
nx-X11/programs/Xserver/os/access.c
+3
-17
connection.c
nx-X11/programs/Xserver/os/connection.c
+0
-12
rpcauth.c
nx-X11/programs/Xserver/os/rpcauth.c
+0
-5
utils.c
nx-X11/programs/Xserver/os/utils.c
+0
-10
xdmcp.c
nx-X11/programs/Xserver/os/xdmcp.c
+0
-5
No files found.
nx-X11/config/cf/Imake.cf
View file @
754e48ac
...
...
@@ -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
...
...
nx-X11/include/Xpoll.h.in
View file @
754e48ac
...
...
@@ -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>
...
...
nx-X11/programs/Xserver/os/access.c
View file @
754e48ac
...
...
@@ -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):
...
...
nx-X11/programs/Xserver/os/connection.c
View file @
754e48ac
...
...
@@ -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>
...
...
nx-X11/programs/Xserver/os/rpcauth.c
View file @
754e48ac
...
...
@@ -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>
...
...
nx-X11/programs/Xserver/os/utils.c
View file @
754e48ac
...
...
@@ -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
...
...
nx-X11/programs/Xserver/os/xdmcp.c
View file @
754e48ac
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment