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>

4 files changed, 3 insertions, 63 deletions

diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
index 8f10b910..3369b430 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
@@ -64,14 +64,6 @@ extern "C" {
 #endif
 #endif
 
-#ifdef _HPUX 
-#if defined __cplusplus
-#define __inline inline
-#else
-#define __inline 
-#endif /* __cplusplus */
-#endif
-
 #if defined _AIX
 #if defined __cplusplus
 #define __inline inline
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
index c06f3ac8..157a85c9 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
@@ -766,45 +766,6 @@ static __inline__ INT32 HXAtomicSubRetINT32(INT32* p, INT32 n) { return HXAtomic
 
 
 /***********************************************************************
- * HP-UX / IA64 (Native compiler)
- *
- * Implementation Notes:
- *      A work-in-progress...
- */
-#elif defined(_HPUX) && defined(_IA64)
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-    UINT32 _HXAtomicIncRetUINT32 (UINT32* pNum);
-    UINT32 _HXAtomicDecRetUINT32 (UINT32* pNum);
-    UINT32 _HXAtomicAddRetUINT32 (UINT32* pNum, UINT32 ulNum);
-    UINT32 _HXAtomicSubRetUINT32 (UINT32* pNum, UINT32 ulNum);
-#if defined(__cplusplus)
-}
-#endif
-
-#define HXAtomicIncINT32(p)       _HXAtomicIncRetUINT32((UINT32*)(p))
-#define HXAtomicDecINT32(p)       _HXAtomicDecRetUINT32((UINT32*)(p))
-#define HXAtomicIncRetINT32(p)    _HXAtomicIncRetUINT32((UINT32*)(p))
-#define HXAtomicDecRetINT32(p)    _HXAtomicDecRetUINT32((UINT32*)(p))
-#define HXAtomicAddINT32(p,n)     _HXAtomicAddRetUINT32((UINT32*)(p),(INT32)(n))
-#define HXAtomicSubINT32(p,n)     _HXAtomicSubRetUINT32((UINT32*)(p),(INT32)(n))
-#define HXAtomicAddRetINT32(p,n)  _HXAtomicAddRetUINT32((UINT32*)(p),(INT32)(n))
-#define HXAtomicSubRetINT32(p,n)  _HXAtomicSubRetUINT32((UINT32*)(p),(INT32)(n))
-
-#define HXAtomicIncUINT32(p)      _HXAtomicIncRetUINT32((p))
-#define HXAtomicDecUINT32(p)      _HXAtomicDecRetUINT32((p))
-#define HXAtomicIncRetUINT32(p)   _HXAtomicIncRetUINT32((p))
-#define HXAtomicDecRetUINT32(p)   _HXAtomicDecRetUINT32((p))
-#define HXAtomicAddUINT32(p,n)    _HXAtomicAddRetUINT32((p),(n))
-#define HXAtomicSubUINT32(p,n)    _HXAtomicSubRetUINT32((p),(n))
-#define HXAtomicAddRetUINT32(p,n) _HXAtomicAddRetUINT32((p),(n))
-#define HXAtomicSubRetUINT32(p,n) _HXAtomicSubRetUINT32((p),(n))
-
-
-
-/***********************************************************************
  * AIX / PowerPC (Native compiler)
  *
  * Implementation Notes:
@@ -975,12 +936,6 @@ static inline void HXAtomicSubUINT32(UINT32* p, UINT32 n) { (void)HXAtomicSubRet
  *   Any platforms that use this should be documented here!
  *   Why are you using the generic operators for this platform?
  *
- * HP-UX / HP-PA:
- *   This is used on the HP-PA processor since it doesn't provide the
- *   necessary assembler operators to implement proper atomic updates
- *   of ints.  HP's mutex primitive seems pretty fast however, resulting
- *   in a workable solution.
- *
  * OpenBSD:
  *   The standard assembler on x86 can't handle the gcc/asm operators
  *   defined above, so we're using the lock-pool approach for now.
@@ -988,7 +943,7 @@ static inline void HXAtomicSubUINT32(UINT32* p, UINT32 n) { (void)HXAtomicSubRet
  *   builds more easily (someday).
  *
  */
-#elif defined(_HPUX) || defined(_OPENBSD)
+#elif defined(_OPENBSD)
 
 #if defined(__cplusplus)
 #include "microsleep.h"
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
index 9f279dd6..616be9e0 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
@@ -591,9 +591,6 @@ typedef void (*RANOTIFYPROC)( void* );
 #ifdef _AIX
     typedef int                 tv_sec_t;
     typedef int                 tv_usec_t;
-#elif (defined _HPUX)
-    typedef UINT32              tv_sec_t;
-    typedef INT32               tv_usec_t;
 #else
     typedef INT32               tv_sec_t;
     typedef INT32               tv_usec_t;
@@ -641,7 +638,7 @@ typedef ULONG32 HXXIMAGE;
 #endif
 
 
-#if defined _LONG_IS_64 && (defined _SOLARIS || defined _HPUX)
+#if defined _LONG_IS_64 && defined _SOLARIS
 typedef unsigned long PTR_INT;
 #else
 typedef unsigned int PTR_INT;
diff --git a/config.h.in b/config.h.in
index 591c2aff..426f17ce 100644
--- a/config.h.in
+++ b/config.h.in
@@ -380,11 +380,7 @@ unsigned long strlcpy(char*, const char*, unsigned long);
 
 
 
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
+#if !defined(HAVE_VSNPRINTF)
 #if __STDC__
 #include <stdarg.h>
 #include <stdlib.h>