[Libreoffice-commits] .: 2 commits - idlc/source registry/source sal/inc sal/osl
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 16 11:17:55 PST 2011
idlc/source/preproc/include.c | 7 --
idlc/source/preproc/macro.c | 7 --
registry/source/reflread.cxx | 4 -
registry/source/reflwrit.cxx | 4 -
registry/source/regimpl.cxx | 4 -
registry/source/registry.cxx | 4 -
sal/inc/osl/endian.h | 20 --------
sal/inc/sal/config.h | 9 ---
sal/inc/sal/types.h | 2
sal/osl/os2/system.h | 61 -------------------------
sal/osl/unx/process.c | 26 ----------
sal/osl/unx/system.c | 100 ------------------------------------------
sal/osl/unx/system.h | 60 -------------------------
13 files changed, 5 insertions(+), 303 deletions(-)
New commits:
commit ef7909c0c4364067775b329aef626b6d0bbe2ca5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 13:27:08 2011 +0100
Remove SCO support
diff --git a/idlc/source/preproc/include.c b/idlc/source/preproc/include.c
index 0743693..f94f3b5 100644
--- a/idlc/source/preproc/include.c
+++ b/idlc/source/preproc/include.c
@@ -37,10 +37,6 @@
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
-
-#ifdef SCO
-#define _IBCS2
-#endif
#include <limits.h>
#include "cpp.h"
diff --git a/idlc/source/preproc/macro.c b/idlc/source/preproc/macro.c
index 693c30c..fcfdd44 100644
--- a/idlc/source/preproc/macro.c
+++ b/idlc/source/preproc/macro.c
@@ -31,10 +31,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#ifdef SCO
-# define _IBCS2
-#endif
#include <limits.h>
#include "cpp.h"
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 2c53632..e7e80c9 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -51,10 +51,6 @@ const sal_uInt32 magic = 0x12345678;
const sal_uInt16 minorVersion = 0x0000;
const sal_uInt16 majorVersion = 0x0001;
-#if defined ( GCC ) && ( defined ( SCO ) )
-ORealDynamicLoader* ODynamicLoader<RegistryTypeReader_Api>::m_pLoader = NULL;
-#endif
-
/**************************************************************************
class BlopObject
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index ebb792f..3e54ff6 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -58,10 +58,6 @@ inline rtl::OString toByteString(rtl_uString const * str) {
static sal_Unicode NULL_WSTRING[1] = { 0 };
-#if defined ( GCC ) && ( defined ( SCO ) )
-ORealDynamicLoader* ODynamicLoader<RegistryTypeWriter_Api>::m_pLoader = NULL;
-#endif
-
#define BLOP_OFFSET_MAGIC 0
#define BLOP_OFFSET_SIZE (BLOP_OFFSET_MAGIC + sizeof(sal_uInt32))
#define BLOP_OFFSET_MINOR (BLOP_OFFSET_SIZE + sizeof(sal_uInt32))
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 2dcd4bc..a21f9ea 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -65,10 +65,6 @@ using namespace rtl;
using namespace osl;
using namespace store;
-#if defined ( GCC ) && ( defined ( SCO ) )
-sal_helper::ORealDynamicLoader* sal_helper::ODynamicLoader<RegistryTypeReader_Api>::m_pLoader = NULL;
-#endif
-
namespace {
void printString(rtl::OUString const & s) {
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 7e2c09b..8d8fed3 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -47,10 +47,6 @@
#include <unistd.h>
#endif
-#if defined ( GCC ) && ( defined ( SCO ) )
-ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL;
-#endif
-
extern "C" {
//*********************************************************************
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index d02b352..9638625 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -94,18 +94,6 @@ extern "C" {
#endif
#endif
-#ifdef SCO
-# include <sys/types.h>
-# include <sys/byteorder.h>
-# if BYTE_ORDER == LITTLE_ENDIAN
-# define _LITTLE_ENDIAN
-# elif BYTE_ORDER == BIG_ENDIAN
-# define _BIG_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
-#endif
-
#ifdef AIX
# include <sys/machine.h>
# if BYTE_ORDER == LITTLE_ENDIAN
@@ -153,7 +141,7 @@ extern "C" {
/** Check supported platform.
*/
#if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \
- !defined(LINUX) && !defined(NETBSD) && !defined(SCO) && \
+ !defined(LINUX) && !defined(NETBSD) && \
!defined(AIX) && !defined(OPENBSD) && \
!defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \
!defined(DRAGONFLY)
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index be105cb..9c60e5a 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -222,37 +222,6 @@ int debug_printf(const char *f, ...);
# define NO_PTHREAD_RTL
#endif
-#ifdef SCO
-# define AF_IPX -1
-# include <strings.h>
-# include <pthread.h>
-# include <shadow.h>
-# include <netdb.h>
-# include <sys/un.h>
-# include <sys/netinet/tcp.h>
-# include <sys/types.h>
-# include <sys/byteorder.h>
-# include <dlfcn.h>
-# if BYTE_ORDER == LITTLE_ENDIAN
-# define _LITTLE_ENDIAN
-# elif BYTE_ORDER == BIG_ENDIAN
-# define _BIG_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
-# define sched_yield() pthread_yield()
-# define pthread_testcancel()
-# define NO_PTHREAD_RTL
-# define NO_PTHREAD_PRIORITY
-extern int pthread_cancel(pthread_t);
-extern unsigned int nanosleep(unsigned int);
-# define SLEEP_TIMESPEC(timespec) (timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
-# define PATH_MAX _POSIX_PATH_MAX
-# define S_ISSOCK S_ISFIFO
-# define PTHREAD_SIGACTION pthread_sigaction
-# define STAT_PARENT stat
-#endif
-
#ifdef AIX
# define AF_IPX -1
# include <strings.h>
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index c615497..24d63e1 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -187,106 +187,6 @@ struct tm *gmtime_r(const time_t *timep, struct tm *buffer)
}
#endif /* defined NETBSD */
-#ifdef SCO
-#include <pwd.h>
-#include <shadow.h>
-#include <sys/types.h>
-
-struct spwd *getspnam_r(const char *name, struct spwd* s, char* buffer, int size )
-{
- struct spwd* res;
-
- pthread_mutex_lock(&getrtl_mutex);
-
- if ( res = getspnam(name) )
- {
- int nnamp;
-
- nnamp = strlen(res->sp_namp)+1;
-
- if (nnamp+strlen(res->sp_pwdp) < size) {
- memcpy(s, res, sizeof(struct spwd));
-
- strcpy(buffer, res->sp_namp);
- s->sp_namp = buffer;
- buffer += nnamp;
-
- strcpy(buffer, res->sp_pwdp);
- s->sp_pwdp = buffer;
-
- res = s;
- }
- else
- res = 0;
- }
-
- pthread_mutex_unlock(&getrtl_mutex);
-
- return res;
-}
-
-struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
-{
- struct passwd* res;
-
- pthread_mutex_lock(&getrtl_mutex);
-
- if ( res = getpwnam(name) )
- {
- int nname, npasswd, nage;
- int ncomment, ngecos, ndir;
-
- nname= strlen(res->pw_name)+1;
- npasswd= strlen(res->pw_passwd)+1;
- nage= strlen(res->pw_age)+1;
- ncomment= strlen(res->pw_comment)+1;
- ngecos= strlen(res->pw_gecos)+1;
- ndir= strlen(res->pw_dir)+1;
-
- if (nname+npasswd+nage+ncomment+ngecos+ndir
- +strlen(res->pw_shell) < size)
- {
- memcpy(s, res, sizeof(struct passwd));
-
- strcpy(buffer, res->pw_name);
- s->pw_name = buffer;
- buffer += nname;
-
- strcpy(buffer, res->pw_passwd);
- s->pw_passwd = buffer;
- buffer += npasswd;
-
- strcpy(buffer, res->pw_age);
- s->pw_age = buffer;
- buffer += nage;
-
- strcpy(buffer, res->pw_comment);
- s->pw_comment = buffer;
- buffer += ncomment;
-
- strcpy(buffer, res->pw_gecos);
- s->pw_gecos = buffer;
- buffer += ngecos;
-
- strcpy(buffer, res->pw_dir);
- s->pw_dir = buffer;
- buffer += ndir;
-
- strcpy(buffer, res->pw_shell);
- s->pw_shell = buffer;
-
- res = s;
- }
- else
- res = 0;
- }
-
- pthread_mutex_unlock(&getrtl_mutex);
-
- return res;
-}
-#endif /* defined SCO */
-
#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
extern int h_errno;
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index fa9c58c..8f8efca 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -244,37 +244,6 @@
# define IORESOURCE_TRANSFER_BSD
#endif
-#ifdef SCO
-# define AF_IPX -1
-# include <strings.h>
-# include <pthread.h>
-# include <shadow.h>
-# include <netdb.h>
-# include <sys/un.h>
-# include <sys/netinet/tcp.h>
-# include <sys/types.h>
-# include <sys/byteorder.h>
-# include <dlfcn.h>
-# if BYTE_ORDER == LITTLE_ENDIAN
-# define _LITTLE_ENDIAN
-# elif BYTE_ORDER == BIG_ENDIAN
-# define _BIG_ENDIAN
-# elif BYTE_ORDER == PDP_ENDIAN
-# define _PDP_ENDIAN
-# endif
-# define sched_yield() pthread_yield()
-# define pthread_testcancel()
-# define NO_PTHREAD_RTL
-# define NO_PTHREAD_PRIORITY
-extern int pthread_cancel(pthread_t);
-extern unsigned int nanosleep(unsigned int);
-# define SLEEP_TIMESPEC(timespec) (timespec .tv_sec > 0) ? sleep(timespec .tv_sec), nanosleep(timespec .tv_nsec) : nanosleep(timespec .tv_nsec)
-# define PATH_MAX _POSIX_PATH_MAX
-# define S_ISSOCK S_ISFIFO
-# define PTHREAD_SIGACTION pthread_sigaction
-# define STAT_PARENT stat
-#endif
-
#ifdef AIX
# define AF_IPX -1
# include <strings.h>
commit 94b6f309c6eb8cab0460fa5fae38f65a7f0b5fde
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 12:55:05 2011 +0100
Remove HPUX support
diff --git a/idlc/source/preproc/include.c b/idlc/source/preproc/include.c
index da750b2..0743693 100644
--- a/idlc/source/preproc/include.c
+++ b/idlc/source/preproc/include.c
@@ -38,9 +38,6 @@
#include <string.h>
#include <fcntl.h>
-#ifdef __hpux
-# define _HPUX_SOURCE
-#endif
#ifdef SCO
#define _IBCS2
#endif
diff --git a/idlc/source/preproc/macro.c b/idlc/source/preproc/macro.c
index c4e4d2d..693c30c 100644
--- a/idlc/source/preproc/macro.c
+++ b/idlc/source/preproc/macro.c
@@ -32,9 +32,6 @@
#include <stdlib.h>
#include <string.h>
-#ifdef __hpux
-# define _HPUX_SOURCE
-#endif
#ifdef SCO
# define _IBCS2
#endif
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index b99ae34..d02b352 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 a1c5361..944f6a0 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 353bf0f..229f79c 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 e3c466d..be105cb 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 e736a25..63dc7cb 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 047a643..fa9c58c 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!"
More information about the Libreoffice-commits
mailing list