Remove HPUX support

6 files changed, 4 insertions, 98 deletions

diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index aecf7dd84580..628c80e7f1f7 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -121,10 +121,6 @@ extern "C" {
 #   endif
 #endif
 
-#ifdef HPUX
-#   include <machine/param.h>
-#endif
-
 #ifdef _WIN16
 #   define  _LITTLE_ENDIAN
 #endif
@@ -158,7 +154,7 @@ extern "C" {
  */
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)     && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(SCO)     && \
-    !defined(AIX)     && !defined(HPUX)   && !defined(OPENBSD) && \
+    !defined(AIX)     && !defined(OPENBSD) && \
     !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \
     !defined(DRAGONFLY)
 #   error "Target platform not specified !"
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index d1ef84114f90..ffee8f9a4439 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -115,15 +115,6 @@
 #define SAL_SYSCONFIGFILE( name ) "." name "rc"
 #endif
 
-#ifdef HPUX
-#define SAL_UNX
-#define SAL_DLLEXTENSION ".sl"
-#define SAL_DLLPREFIX "lib"
-#define SAL_PRGEXTENSION ".bin"
-#define SAL_CONFIGFILE( name ) name "rc"
-#define SAL_SYSCONFIGFILE( name ) "." name "rc"
-#endif
-
 #ifdef sun
 #undef sun
 #define sun sun
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 2f25749f7d4a..fdaaab18ba1e 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -105,7 +105,7 @@ typedef unsigned char       sal_uInt8;
     #define SAL_PRIuUINT64 "I64u"
     #define SAL_PRIxUINT64 "I64x"
     #define SAL_PRIXUINT64 "I64X"
-#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined (__GNUC__) || defined(__hpux) || defined (sgi)
+#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined (__GNUC__) || defined (sgi)
     #if SAL_TYPES_SIZEOFLONG == 8
         typedef signed long int         sal_Int64;
         typedef unsigned long int       sal_uInt64;
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index ec1853baeb6a..cdcaa45f0f92 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -276,34 +276,6 @@ extern unsigned int nanosleep(unsigned int);
 #   define  NO_DL_FUNCTIONS
 #endif
 
-#ifdef HPUX
-#   define  AF_IPX -1
-#   undef   howmany
-#   undef   MAXINT
-#   include <pthread.h>
-#   include <sys/un.h>
-#   include <sys/sched.h>
-#   include <sys/xti.h>
-#   include <sys/pstat.h>
-#   include <shadow.h>
-#   include <crypt.h>
-#   include <machine/param.h>
-#   define  LIBPATH "SHLIB_PATH"
-#   define  PTR_SIZE_T(s)               ((int *)&(s))
-#   define  PTR_FD_SET(s)               ((int *)&(s))
-#   define  PTHREAD_VALUE(t)            ((t).field2)
-#   define  PTHREAD_NONE_INIT           { 0, -1 }
-#   define  PTHREAD_ATTR_DEFAULT        pthread_attr_default
-#   define  PTHREAD_MUTEXATTR_DEFAULT   pthread_mutexattr_default
-#   define  PTHREAD_CONDATTR_DEFAULT    pthread_condattr_default
-#   define  pthread_detach(t)           pthread_detach(&(t))
-#   define  NO_PTHREAD_PRIORITY
-#   define  NO_PTHREAD_SEMAPHORES
-#   define  NO_DL_FUNCTIONS
-#   undef   sigaction
-#   define  PTHREAD_SIGACTION           cma_sigaction
-#endif
-
 #ifdef SOLARIS
 #   include <shadow.h>
 #   include <sys/procfs.h>
@@ -356,7 +328,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
 
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
-    !defined(AIX)     && !defined(HPUX)   && \
+    !defined(AIX)     && \
     !defined(SOLARIS) && !defined(MAC) && \
     !defined(MACOSX)
 #   error "Target plattform not specified !"
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 7a4bdb8785c3..3f864b9988de 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -1351,32 +1351,6 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
                 close(fd);
         }
 
-#elif defined(HPUX)
-
-        struct pst_status prstatus;
-
-        if (pstat_getproc(&prstatus, sizeof(prstatus), (size_t)0, pid) == 1)
-        {
-            if (Fields & osl_Process_CPUTIMES)
-            {
-                pInfo->UserTime.Seconds   = prstatus.pst_utime;
-                pInfo->UserTime.Nanosec   = 500000L;
-                pInfo->SystemTime.Seconds = prstatus.pst_stime;
-                pInfo->SystemTime.Nanosec = 500000L;
-
-                pInfo->Fields |= osl_Process_CPUTIMES;
-            }
-
-            if (Fields & osl_Process_HEAPUSAGE)
-            {
-                pInfo->HeapUsage = prstatus.pst_vdsize*PAGESIZE;
-
-                pInfo->Fields |= osl_Process_HEAPUSAGE;
-            }
-
-            return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown;
-        }
-
 #elif defined(LINUX)
 
         if ( (Fields & osl_Process_CPUTIMES) || (Fields & osl_Process_HEAPUSAGE) )
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index e2a3853f5ec6..d969005ea95d 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -300,33 +300,6 @@ extern unsigned int nanosleep(unsigned int);
 #   define  NO_PTHREAD_SEMAPHORES
 #endif
 
-#ifdef HPUX
-#   define  AF_IPX -1
-#   undef   howmany
-#   undef   MAXINT
-#   include <pthread.h>
-#   include <sys/un.h>
-#   include <sys/sched.h>
-#   include <sys/xti.h>
-#   include <sys/pstat.h>
-#   include <shadow.h>
-#   include <crypt.h>
-#   include <machine/param.h>
-#   define  LIBPATH "SHLIB_PATH"
-#   define  PTR_FD_SET(s)               ((int *)&(s))
-#   define  PTHREAD_VALUE(t)            ((t).field2)
-#   define  PTHREAD_NONE_INIT           { 0, -1 }
-#   define  PTHREAD_ATTR_DEFAULT        pthread_attr_default
-#   define  PTHREAD_MUTEXATTR_DEFAULT   pthread_mutexattr_default
-#   define  PTHREAD_CONDATTR_DEFAULT    pthread_condattr_default
-#   define  pthread_detach(t)           pthread_detach(&(t))
-#   define  NO_PTHREAD_PRIORITY
-#   define  NO_PTHREAD_SEMAPHORES
-#   define  NO_DL_FUNCTIONS
-#   undef   sigaction
-#   define  PTHREAD_SIGACTION           cma_sigaction
-#endif
-
 #ifdef SOLARIS
 #   include <shadow.h>
 #   include <sys/un.h>
@@ -392,7 +365,7 @@ int macxp_resolveAlias(char *path, int buflen);
 
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
-    !defined(AIX)     && !defined(HPUX)   && \
+    !defined(AIX)     && \
     !defined(SOLARIS) && !defined(MACOSX) && \
     !defined(OPENBSD) && !defined(DRAGONFLY)
 #   error "Target platform not specified!"