summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--idlc/source/preproc/include.c4
-rw-r--r--idlc/source/preproc/macro.c4
-rw-r--r--registry/source/reflread.cxx4
-rw-r--r--registry/source/reflwrit.cxx4
-rw-r--r--registry/source/regimpl.cxx4
-rw-r--r--registry/source/registry.cxx4
-rw-r--r--sal/inc/osl/endian.h14
-rw-r--r--sal/osl/os2/system.h31
-rw-r--r--sal/osl/unx/system.c100
-rw-r--r--sal/osl/unx/system.h31
10 files changed, 1 insertions, 199 deletions
diff --git a/idlc/source/preproc/include.c b/idlc/source/preproc/include.c
index 980521197028..d79b04084a8a 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 0bc3c76825d1..e30459958564 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 cc098171c183..ad5821d587f9 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 c6e3d88328af..6d4cc9a94e3e 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 a3079c7fc123..e43f8054d32b 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 ecb1a44ec069..042e8ec17c44 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 628c80e7f1f7..b1711a498788 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 cdcaa45f0f92..b6a31c3b1e63 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 953d473605d4..b6fa769d293c 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 d969005ea95d..c00ea21624d1 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>