diff options
| author | Patrick Luby <pluby@openoffice.org> | 2000-12-14 06:35:19 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2000-12-14 06:35:19 +0000 |
| commit | b248734d34c4f38493e90820efb54e3ac75979c4 (patch) | |
| tree | 3c0d897dcbdb072ccb271dd217e176d1ddd95df8 /sal/osl/unx/thread.c | |
| parent | 7cbda3973ca6444caaa84e26fa60785d76f4e90f (diff) | |
Updated to SRC614
Diffstat (limited to 'sal/osl/unx/thread.c')
| -rw-r--r-- | sal/osl/unx/thread.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c index 36caac657..eedf0e546 100644 --- a/sal/osl/unx/thread.c +++ b/sal/osl/unx/thread.c @@ -2,9 +2,9 @@ * * $RCSfile: thread.c,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mfe $ $Date: 2000-12-01 17:13:47 $ + * last change: $Author: pluby $ $Date: 2000-12-14 07:34:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,9 @@ #include <rtl/string.h> #include <rtl/tencinfo.h> #include <locale.h> +#ifndef MACOSX #include <langinfo.h> +#endif /*****************************************************************************/ /* Thread-data structure hidden behind oslThread: */ @@ -1071,7 +1073,7 @@ static rtl_TextEncoding GetSystemCharSetFromLocale( const char* pLocaleString ); static rtl_TextEncoding GetSystemCharSetFromEnvironment(); #endif /* if def NETBSD || SCO */ -#if defined(LINUX) || defined(SOLARIS) +#ifdef UNX typedef struct { const char *key; |