summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-16 13:07:49 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-16 20:17:26 +0100
commitb2bf8c258281feabbe3933b61a4d3397d220852f (patch)
tree1a4bf55423b20645e36da9ba9c1b78d9e340f28e /tools
parent83c35aa428e910e17042babcfe4abf15266f1dcf (diff)
Remove HPUX support
Diffstat (limited to 'tools')
-rw-r--r--tools/bootstrp/command.cxx2
-rw-r--r--tools/inc/tools/inetdef.hxx6
-rw-r--r--tools/inc/tools/solar.h2
-rw-r--r--tools/source/fsys/unx.cxx2
-rw-r--r--tools/source/stream/strmunx.cxx17
5 files changed, 4 insertions, 25 deletions
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index 08764627dff5..f47598f5cfd8 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.cxx
@@ -73,7 +73,7 @@
#include <sys/types.h>
#include <unistd.h>
#if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \
- || defined (HPUX) || defined (MACOSX) || defined (OPENBSD) \
+ || defined (MACOSX) || defined (OPENBSD) \
|| defined(DRAGONFLY)
#include <sys/wait.h>
#else
diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
index e1375cd589fa..28050f52c998 100644
--- a/tools/inc/tools/inetdef.hxx
+++ b/tools/inc/tools/inetdef.hxx
@@ -37,8 +37,6 @@
#elif defined UNX
#if defined AIX
#define TOOLS_INETDEF_OS "AIX"
-#elif defined HPUX
-#define TOOLS_INETDEF_OS "HP/UX"
#elif defined SOLARIS && defined SPARC
#define TOOLS_INETDEF_OS "Solaris Sparc"
#elif defined SOLARIS && defined INTEL
@@ -67,9 +65,9 @@
#define TOOLS_INETDEF_OS "DragonFly/i386"
#elif defined DRAGONFLY && defined X86_64
#define TOOLS_INETDEF_OS "DragonFly/amd64"
-#else // AIX, HPUX, SOLARIS, ...
+#else // AIX, SOLARIS, ...
#define TOOLS_INETDEF_OS "Unix"
-#endif // AIX, HPUX, SOLARIS, ...
+#endif // AIX, SOLARIS, ...
#else // WNT, ...
#define TOOLS_INETDEF_OS "unknown OS"
#endif // WN, ...
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 13df4e9b0755..fbe94910a575 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -283,8 +283,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
#define __DLLEXTENSION "go"
#elif defined AIX
#define __DLLEXTENSION "ap.so"
-#elif defined HPUX
- #define __DLLEXTENSION "hr.sl"
#elif defined SOLARIS && defined SPARC && defined IS_LP64
#define __DLLEXTENSION "su.so"
#elif defined SOLARIS && defined SPARC && !defined __GNUC__
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 2dcb32c66c2e..109ea26dd4d0 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <utime.h>
-#if defined HPUX || defined LINUX
+#if defined LINUX
#include <mntent.h>
#define mnttab mntent
#elif defined SCO
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index feefaf3fe6cd..cbe6a658fce6 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -504,8 +504,6 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes )
// NFS-2-Server (kein Lockdaemon) zu verhindern.
// File-Locking ?ber NFS ist generell ein Performancekiller.
// HR, 22.10.1997 fuer SOLARIS
- // CP, 30.11.1997 fuer HPUX
- // ER, 18.12.1997 fuer IRIX
// HR, 18.05.1998 Environmentvariable
if ( pFileLockEnvVar == (char*)1 )
@@ -516,13 +514,6 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes )
aflock.l_type = nLockMode;
if (fcntl(pInstanceData->nHandle, F_GETLK, &aflock) == -1)
{
- #if ( defined HPUX && defined BAD_UNION )
- #ifdef DBG_UTIL
- fprintf( stderr, "***** FCNTL(lock):errno = %d\n", errno );
- #endif
- if ( errno == EINVAL || errno == ENOSYS )
- return sal_True;
- #endif
#if defined SOLARIS
if (errno == ENOSYS)
return sal_True;
@@ -576,14 +567,6 @@ sal_Bool SvFileStream::UnlockRange( sal_Size nByteOffset, sal_Size nBytes )
if (fcntl(pInstanceData->nHandle, F_SETLK, &aflock) != -1)
return sal_True;
-#if ( defined HPUX && defined BAD_UNION )
-#ifdef DBG_UTIL
- fprintf( stderr, "***** FCNTL(unlock):errno = %d\n", errno );
-#endif
- if ( errno == EINVAL || errno == ENOSYS )
- return sal_True;
-#endif
-
SetError( ::GetSvError( errno ));
return sal_False;
}