diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 12:10:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 12:10:10 +0000 |
| commit | 23f983667974a182dfa27d7e51cd168fcd45a41f (patch) | |
| tree | 01980cfc9af31a40ae7cc254359c634324523894 /shell/inc | |
| parent | 1ca7a6bb59dc4f460206a2fc7c8741e0931cff36 (diff) | |
INTEGRATION: CWS os2port02 (1.6.58); FILE MERGED
2007/10/04 19:45:57 ydario 1.6.58.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/internal/utilities.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index 2f7b88dd23..024dd64d55 100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -4,9 +4,9 @@ * * $RCSfile: utilities.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2007-01-02 16:12:16 $ + * last change: $Author: hr $ $Date: 2007-11-02 13:10:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -40,7 +40,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#ifndef OS2 #include <windows.h> +#endif #if defined _MSC_VER #pragma warning(pop) #endif @@ -91,6 +93,8 @@ bool HasOnlySpaces(const std::wstring& String); Windows Locale Identifier corresponding to input LocaleSet. */ +#ifndef OS2 LCID LocaleSetToLCID( const LocaleSet_t & Locale ); +#endif #endif |