From b96212b04ae134e76f1066af05fa956b5e53fe13 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 2 Nov 2007 12:10:10 +0000 Subject: 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. --- shell/inc/internal/utilities.hxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'shell/inc/internal') diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index 5ceef531d836..55e65b410dbd 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 +#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 -- cgit