Remove support for HPUX, which is discontinued and does not provide a c++17 complaint compiler.drop/hpux-support

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 10 insertions, 75 deletions

diff --git a/dcop/KDE-ICE/Xtrans.c b/dcop/KDE-ICE/Xtrans.c
index c85a9263d..ec2502a0b 100644
--- a/dcop/KDE-ICE/Xtrans.c
+++ b/dcop/KDE-ICE/Xtrans.c
@@ -678,7 +678,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(__EMX__) && !defined(SCO)) && !defined(__QNX__)
+#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(AIXV3) && !defined(uniosu) && !defined(__EMX__) && !defined(SCO)) && !defined(__QNX__)
 	    ret = fcntl (fd, F_GETFL, 0);
 	    if (ret != -1)
 		ret = fcntl (fd, F_SETFL, ret | O_NONBLOCK);
@@ -1309,7 +1309,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/dcop/KDE-ICE/Xtransint.h b/dcop/KDE-ICE/Xtransint.h
index dfe89baf8..d557cc9ee 100644
--- a/dcop/KDE-ICE/Xtransint.h
+++ b/dcop/KDE-ICE/Xtransint.h
@@ -108,7 +108,7 @@ extern int  errno;		/* Internal system error number. */
  * 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/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c
index 62e0ee0cd..5bfbe3401 100644
--- a/dcop/KDE-ICE/Xtranssock.c
+++ b/dcop/KDE-ICE/Xtranssock.c
@@ -79,9 +79,9 @@ from The Open Group.
 #include <sys/stat.h>
 #endif
 
-#if defined(hpux) || defined(__EMX__)
+#if defined(__EMX__)
 #define NO_TCP_H
-#endif /* hpux */
+#endif
 #ifdef MOTOROLA
 #ifdef SYSV
 #define NO_TCP_H
@@ -208,37 +208,6 @@ static Sockettrans2dev Sockettrans2devtab[] = {
 
 #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"
 #define UNIX_DIR "/tmp/.X11-unix"
@@ -264,8 +233,6 @@ static Sockettrans2dev Sockettrans2devtab[] = {
 #define UNIX_DIR  "/tmp/.X11-unix"
 #endif
 
-#endif /* hpux */
-
 #endif /* UNIXCONN */
 
 #define PORTBUFSIZE	32
@@ -967,7 +934,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
     /*
      * Now that the listener is esablished, create the addr info for
      * this connection. getpeername() doesn't work for UNIX Domain Sockets
-     * on some systems (hpux at least), so we will just do it manually, instead
+     * on some systems, so we will just do it manually, instead
      * of calling something like TRANS(SocketUNIXGetAddr).
      */
 
@@ -1535,12 +1502,6 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
     struct sockaddr_un	sockname;
     int			namelen;
 
-#if defined(hpux) && defined(X11_t)
-    struct sockaddr_un	old_sockname;
-    int			old_namelen;
-#endif
-
-
     PRMSG (2,"[Xtranssock] SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
 
     /*
@@ -1587,20 +1548,6 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
     sockname.sun_len = namelen;
 #endif
 
-#if defined(hpux) && defined(X11_t)
-    /*
-     * This is gross, but it was in Xlib
-     */
-    old_sockname.sun_family = AF_UNIX;
-    if (set_sun_path(port, OLD_UNIX_PATH, old_sockname.sun_path) != 0) {
-	PRMSG (1, "[Xtranssock] 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
-
-
     /*
      * Do the connect()
      */
@@ -1610,18 +1557,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;
diff --git a/dcop/dcopidl/scanner.cpp b/dcop/dcopidl/scanner.cpp
index 4ff8d1ac3..be0cb6c4d 100644
--- a/dcop/dcopidl/scanner.cpp
+++ b/dcop/dcopidl/scanner.cpp
@@ -975,8 +975,8 @@ static double ascii_to_longdouble (const char *s)
    * this is only an approximation and will probably break fixed<>
    * parameter calculation on systems where
    * sizeof(double) < sizeof(long double). but fortunately all
-   * systems where scanf("%Lf") is known to be broken (Linux/Alpha
-   * and HPUX) have sizeof(double) == sizeof(long double).
+   * systems where scanf("%Lf") is known to be broken (Linux/Alpha)
+   * have sizeof(double) == sizeof(long double).
    */
   d = strtod (s, NULL);
 #endif
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index 710cbc3f4..ec6c48f32 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -64,8 +64,8 @@ static double ascii_to_longdouble (const char *s)
    * this is only an approximation and will probably break fixed<>
    * parameter calculation on systems where
    * sizeof(double) < sizeof(long double). but fortunately all
-   * systems where scanf("%Lf") is known to be broken (Linux/Alpha
-   * and HPUX) have sizeof(double) == sizeof(long double).
+   * systems where scanf("%Lf") is known to be broken (Linux/Alpha)
+   * have sizeof(double) == sizeof(long double).
    */
   d = strtod (s, NULL);
 #endif