[Libreoffice-commits] .: sal/inc sal/osl sal/workben

[François Tigeot]

 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(-)

New commits:
commit 5477745802415912c214efe9d01cbb0ba1b0a3fd
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Fri Feb 18 11:33:23 2011 +0100

    Remove SCO support.

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