From: Remco Rijnders <remco@webconquest.com>
Date: Tue, 8 Sep 2015 13:20:17 +0000 (+0200)
Subject: CLEANUP: Remove obsolete HPUX support
X-Git-Url: http://git.serene-ircd.net/?a=commitdiff_plain;h=e85eac454dd92d52b0f69a7c4dbe3e5bcb8a66e5;p=serene-ircd.git

CLEANUP: Remove obsolete HPUX support
---

diff --git a/Config b/Config
index de72b1d..dc72474 100755
--- a/Config
+++ b/Config
@@ -215,16 +215,6 @@ __EOF__
 		
 	DEFCFLAGS="$DEFOPT"
 	;;
-    *HP-UX*.09.*)
-	DEFCFLAGS="$DEFOPT"
-	DEFLIBS="-lz"
-	OSNAME="HPUX 9.x"
-	;;
-    *HP-UX*.10.*)
-	DEFCFLAGS="$DEFOPT"
-	DEFLIBS="-lz"
-	OSNAME="HPUX 10.x"
-	;;
 esac
 
 echo " "
diff --git a/include/sys.h b/include/sys.h
index 27e8d68..94bc863 100644
--- a/include/sys.h
+++ b/include/sys.h
@@ -104,20 +104,7 @@ extern	char	*rindex PROTO((char *, char));
 # endif
 #endif
 
-
-#ifdef  __hpux
-#define HPUX
-#endif
-
-
-#if defined(HPUX )|| defined(AIX)
-#include <time.h>
-#ifdef AIX
 #include <sys/time.h>
-#endif
-#else
-#include <sys/time.h>
-#endif
 
 #if !defined(DEBUGMODE)
 #  define MyFree(x)	if ((x) != NULL) free(x)
diff --git a/src/bsd.c b/src/bsd.c
index 2c2f2a9..3c2069a 100644
--- a/src/bsd.c
+++ b/src/bsd.c
@@ -41,11 +41,9 @@ VOIDSIG dummy ()
 #ifndef HAVE_RELIABLE_SIGNALS
     (void) signal (SIGALRM, dummy);
     (void) signal (SIGPIPE, dummy);
-#ifndef HPUX			  /* Only 9k/800 series require this, but don't know how to.. */
 #ifdef SIGWINCH
     (void) signal (SIGWINCH, dummy);
 #endif
-#endif
 #else
 #ifdef POSIX_SIGNALS
     struct sigaction act;
diff --git a/src/ircd.c b/src/ircd.c
index 1206732..cdf15a5 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -30,13 +30,7 @@
 #include <sys/file.h>
 #include <pwd.h>
 #include <sys/time.h>
-#ifdef HPUX
-#define _KERNEL			  /* HPUX has the world's worst headers... */
-#endif
 #include <sys/resource.h>
-#ifdef HPUX
-#undef _KERNEL
-#endif
 #include <errno.h>
 #include "h.h"
 
diff --git a/src/s_bsd.c b/src/s_bsd.c
index 642eaa9..485a49f 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -1271,12 +1271,7 @@ int read_message (delay)
 
 	wait.tv_sec = MIN (delay2, delay);
 	wait.tv_usec = usec;
-#ifdef	HPUX
-	nfds = select (FD_SETSIZE, (int *) &read_set, (int *) &write_set,
-		       0, &wait);
-#else
 	nfds = select (FD_SETSIZE, &read_set, &write_set, 0, &wait);
-#endif
 	if (nfds == -1 && errno == EINTR)
 	    return -1;
 	else if (nfds >= 0)
diff --git a/src/s_debug.c b/src/s_debug.c
index 5494f28..7c06c77 100644
--- a/src/s_debug.c
+++ b/src/s_debug.c
@@ -68,17 +68,10 @@ char serveropts[] = {
 #include "whowas.h"
 #include "hash.h"
 #include <sys/file.h>
-#ifdef HPUX
-#include <fcntl.h>
-#endif
 #if !defined(ULTRIX) && !defined(SGI) && !defined(sequent) && \
     !defined(__convex__)
 #include <sys/param.h>
 #endif
-#ifdef HPUX
-#include <sys/syscall.h>
-#define getrusage(a,b) syscall(SYS_GETRUSAGE, a, b)
-#endif
 #ifdef GETRUSAGE_2
 #ifdef SOL20
 #include <sys/time.h>
@@ -95,13 +88,6 @@ char serveropts[] = {
 #ifdef PCS
 #include <time.h>
 #endif
-#ifdef HPUX
-#include <unistd.h>
-#ifdef DYNIXPTX
-#include <sys/types.h>
-#include <time.h>
-#endif
-#endif
 #include "h.h"
 
 #ifndef ssize_t
@@ -152,9 +138,6 @@ void send_usage (cptr, nick)
 #define hzz HZ
 #else
     int hzz = 1;
-#ifdef HPUX
-    hzz = (int) sysconf (_SC_CLK_TCK);
-#endif
 #endif
 #endif
 
@@ -198,9 +181,6 @@ void send_usage (cptr, nick)
     int hzz = 1, ticpermin;
     int umin, smin, usec, ssec;
 
-#ifdef HPUX
-    hzz = sysconf (_SC_CLK_TCK);
-#endif
     ticpermin = hzz * 60;
 
     umin = tmsbuf.tms_utime / ticpermin;
diff --git a/src/s_misc.c b/src/s_misc.c
index a82273e..6f3b092 100644
--- a/src/s_misc.c
+++ b/src/s_misc.c
@@ -36,9 +36,6 @@
 #if defined(PCS) || defined(AIX) || defined(SVR3)
 #include <time.h>
 #endif
-#ifdef HPUX
-#include <unistd.h>
-#endif
 #ifdef DYNIXPTX
 #include <sys/types.h>
 #include <time.h>