aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-12 22:44:21 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-02 19:46:36 +0100
commiteb4ee6c32c5a6b484830fbd1c3c39a36031330e5 (patch)
treea9206cebaa00f77c884dee0a853baa36e6c631e2
parent175a3416ef118a351d2dc97300df73afe94cfb9c (diff)
downloadnx-libs-eb4ee6c32c5a6b484830fbd1c3c39a36031330e5.tar.gz
nx-libs-eb4ee6c32c5a6b484830fbd1c3c39a36031330e5.tar.bz2
nx-libs-eb4ee6c32c5a6b484830fbd1c3c39a36031330e5.zip
undef hpux
-rw-r--r--nx-X11/lib/xtrans/Xtrans.c4
-rw-r--r--nx-X11/lib/xtrans/Xtransint.h2
-rw-r--r--nx-X11/lib/xtrans/Xtranssock.c89
3 files changed, 4 insertions, 91 deletions
diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c
index aa0495b1a..ce413e55a 100644
--- a/nx-X11/lib/xtrans/Xtrans.c
+++ b/nx-X11/lib/xtrans/Xtrans.c
@@ -681,7 +681,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
break;
case 1: /* Set to non-blocking mode */
-#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(hpux) && !defined(AIXV3) && !defined(uniosu) && !defined(__UNIXOS2__) && !defined(SCO325)) && !defined(__QNX__)
+#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(uniosu) && !defined(__UNIXOS2__) && !defined(SCO325)) && !defined(__QNX__)
ret = fcntl (fd, F_GETFL, 0);
if (ret != -1)
ret = fcntl (fd, F_SETFL, ret | O_NONBLOCK);
@@ -1295,7 +1295,7 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
#endif /* SYSV && i386 || WIN32 || __sxg__ */
-#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(__SCO__)
+#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(USG) || defined(SVR4) || defined(__SCO__)
#ifndef NEED_UTSNAME
#define NEED_UTSNAME
#endif
diff --git a/nx-X11/lib/xtrans/Xtransint.h b/nx-X11/lib/xtrans/Xtransint.h
index 1458036ff..747252a22 100644
--- a/nx-X11/lib/xtrans/Xtransint.h
+++ b/nx-X11/lib/xtrans/Xtransint.h
@@ -100,7 +100,7 @@ from The Open Group.
* to avoid a race condition. JKJ (6/5/97)
*/
-# if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(USG) || defined(SVR4) || defined(__SCO__)
+# if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(USG) || defined(SVR4) || defined(__SCO__)
# ifndef NEED_UTSNAME
# define NEED_UTSNAME
# endif
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index f287f6c40..748340c0f 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -117,7 +117,7 @@ from the copyright holders.
#include <sys/stat.h>
#endif
-#if defined(hpux) || (defined(MOTOROLA) && defined(SYSV))
+#if defined(MOTOROLA) && defined(SYSV)
#define NO_TCP_H
#endif
@@ -228,36 +228,6 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
#ifdef UNIXCONN
-#ifdef hpux
-
-#if defined(X11_t)
-#define UNIX_PATH "/usr/spool/sockets/X11/"
-#define UNIX_DIR "/usr/spool/sockets/X11"
-#define OLD_UNIX_PATH "/tmp/.X11-unix/X"
-#endif /* X11_t */
-#if defined(XIM_t)
-#define UNIX_PATH "/usr/spool/sockets/XIM/"
-#define UNIX_DIR "/usr/spool/sockets/XIM"
-#define OLD_UNIX_PATH "/tmp/.XIM-unix/XIM"
-#endif /* XIM_t */
-#if defined(FS_t) || defined(FONT_t)
-#define UNIX_PATH "/usr/spool/sockets/fontserv/"
-#define UNIX_DIR "/usr/spool/sockets/fontserv"
-#endif /* FS_t || FONT_t */
-#if defined(ICE_t)
-#define UNIX_PATH "/usr/spool/sockets/ICE/"
-#define UNIX_DIR "/usr/spool/sockets/ICE"
-#endif /* ICE_t */
-#if defined(TEST_t)
-#define UNIX_PATH "/usr/spool/sockets/xtrans_test/"
-#define UNIX_DIR "/usr/spool/sockets/xtrans_test"
-#endif
-#if defined(LBXPROXY_t)
-#define UNIX_PATH "/usr/spool/sockets/X11/"
-#define UNIX_DIR "/usr/spool/sockets/X11"
-#endif
-
-#else /* !hpux */
#if defined(X11_t)
#define UNIX_PATH "/tmp/.X11-unix/X"
@@ -284,7 +254,6 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
#define UNIX_DIR "/tmp/.X11-unix"
#endif
-#endif /* hpux */
#endif /* UNIXCONN */
@@ -481,30 +450,6 @@ _NXGetUnixPathError:
return _NXUnixPath;
}
-#ifdef hpux
-
-static char *_NXGetOldUnixPath(char *path)
-{
- PRMSG (3, "_NXGetOldUnixPath(%s)\n", path, 0, 0);
-
- if (strcmp(path, OLD_UNIX_PATH) == 0)
- {
-#ifdef NX_TRANS_TEST
- fprintf(stderr, "_NXGetOldUnixPath: Returning X11 Unix path [%s].\n",
- _NXGetUnixPath(path));
-#endif
-
- return _NXGetUnixPath(path);
- }
-
-#ifdef NX_TRANS_TEST
- fprintf(stderr, "_NXGetOldUnixPath: Returning other old X11 Unix path [%s].\n", path);
-#endif
-
- return path;
-}
-
-#endif /* #ifdef hpux */
/*
* Forcibly close any connection attempt on the
@@ -2635,10 +2580,6 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
abstract = ciptr->transptr->flags & TRANS_ABSTRACT;
#endif
-#if defined(hpux) && defined(X11_t)
- struct sockaddr_un old_sockname;
- int old_namelen;
-#endif
PRMSG (2,"SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
@@ -2699,22 +2640,6 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
#endif
-#if defined(hpux) && defined(X11_t)
- /*
- * This is gross, but it was in Xlib
- */
- old_sockname.sun_family = AF_UNIX;
-#ifdef NX_TRANS_SOCKET
- if (set_sun_path(port, _NXGetOldUnixPath(OLD_UNIX_PATH), old_sockname.sun_path) != 0) {
-#else
- if (set_sun_path(port, OLD_UNIX_PATH, old_sockname.sun_path) != 0) {
-#endif
- PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0);
- return TRANS_CONNECT_FAILED;
- }
- old_namelen = strlen (old_sockname.sun_path) +
- sizeof (old_sockname.sun_family);
-#endif
#if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT)
@@ -2747,18 +2672,6 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
int olderrno = errno;
int connected = 0;
-#if defined(hpux) && defined(X11_t)
- if (olderrno == ENOENT)
- {
- if (connect (ciptr->fd,
- (struct sockaddr *) &old_sockname, old_namelen) >= 0)
- {
- connected = 1;
- }
- else
- olderrno = errno;
- }
-#endif
if (!connected)
{
errno = olderrno;