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

Tor Lillqvist tml at kemper.freedesktop.org
Fri Feb 18 02:06:20 PST 2011


 sal/inc/osl/diagnose.h |    9 ---------
 sal/inc/osl/endian.h   |    6 +-----
 sal/osl/os2/system.h   |    2 +-
 sal/osl/unx/system.h   |    2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 3982484b86f366769a9d2602269ecf6b905bf4cb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Feb 16 11:39:33 2011 +0200

    Kill _WIN16

diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index a790ee6..a821266 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -103,15 +103,6 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 #define _OSL_GLOBAL
 #endif  /* __cplusplus */
 
-#ifdef _WIN16
-#if OSL_DEBUG_LEVEL > 0
-#undef OSL_DEBUG_LEVEL
-#define OSL_DEBUG_LEVEL 0
-#endif
-#endif
-
-
-
 #if OSL_DEBUG_LEVEL > 0
 
 #define _OSL_DEBUG_ONLY(f)	(f)
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 9638625..1a447cf 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -109,10 +109,6 @@ extern "C" {
 #   endif
 #endif
 
-#ifdef _WIN16
-#	define	_LITTLE_ENDIAN
-#endif
-
 #ifdef OS2
 #	include <machine/endian.h>
 #endif
@@ -140,7 +136,7 @@ extern "C" {
 
 /** Check supported platform.
  */
-#if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)     && \
+#if !defined(_WIN32)  && !defined(OS2)     && \
     !defined(LINUX)   && !defined(NETBSD) && \
     !defined(AIX)     && !defined(OPENBSD) && \
     !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index 9c60e5a..94825c6 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -295,7 +295,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
 #	include <netinet/tcp.h>
 #endif
 
-#if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
+#if !defined(_WIN32)  && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
     !defined(AIX)     && \
     !defined(SOLARIS) && !defined(MAC) && \
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 8f8efca..d705a44 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -332,7 +332,7 @@ int macxp_resolveAlias(char *path, int buflen);
 #endif
 #endif
 
-#if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
+#if !defined(_WIN32)  && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
     !defined(AIX)     && \
     !defined(SOLARIS) && !defined(MACOSX) && \


More information about the Libreoffice-commits mailing list