This patch gets rid of some remaining SCO tests.
What's strange is that there were references in sal/osl/os2/
It seems the os2/ files are a straight copy of the unx/ files. Is it
possible to merge them ?
--
Francois Tigeot
>From 2c3aad464aef23602c402c185d67ec8a33d244e8 Mon Sep 17 00:00:00 2001
From: Francois Tigeot <ftig...@wolfpond.org>
Date: Fri, 18 Feb 2011 11:33:23 +0100
Subject: [PATCH] Remove SCO support.
---
sal/inc/sal/config.h | 2 +-
sal/osl/os2/system.h | 2 +-
sal/osl/unx/system.h | 2 +-
sal/workben/makefile.mk | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 944f6a0..70f6f11 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -93,7 +93,7 @@
#endif
#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD)
|| \
- defined(SCO) || defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY)
+ defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY)
#define SAL_UNX
#define SAL_DLLEXTENSION ".so"
#define SAL_DLLPREFIX "lib"
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index 94825c6..857b5f0 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -296,7 +296,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix
);
#endif
#if !defined(_WIN32) && !defined(OS2) && \
- !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) &&
!defined(SCO) && \
+ !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && \
!defined(AIX) && \
!defined(SOLARIS) && !defined(MAC) && \
!defined(MACOSX)
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index d705a44..7909ca4 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -333,7 +333,7 @@ int macxp_resolveAlias(char *path, int buflen);
#endif
#if !defined(_WIN32) && !defined(OS2) && \
- !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) &&
!defined(SCO) && \
+ !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && \
!defined(AIX) && \
!defined(SOLARIS) && !defined(MACOSX) && \
!defined(OPENBSD) && !defined(DRAGONFLY)
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index 09022e2..30454c3 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -102,7 +102,7 @@ APP4DEPN=$(SLB)$/sal.lib
#
# tgetpwnam
#
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ||
"$(OS)"=="OPENBSD"
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
OBJFILES+=\
$(OBJ)$/tgetpwnam.obj
@@ -110,7 +110,7 @@ APP5TARGET=tgetpwnam
APP5OBJS=$(OBJ)$/tgetpwnam.obj
APP5STDLIBS=$(SALLIB)
APP5DEPN=$(SLB)$/sal.lib
-.ENDIF # (sco | netbsd | freebsd)
+.ENDIF # (netbsd | freebsd)
#
# measure_oustrings
--
1.7.3.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
