diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 12:09:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 12:09:53 +0000 |
| commit | 442fae863ec70e3089b16c8abce71f8182b76f40 (patch) | |
| tree | 82a3bddd7dd52ee643460ee6ef393f8494b62c9d /shell | |
| parent | 76493e93f3f640361b93d09f6d344183cb0cd747 (diff) | |
INTEGRATION: CWS os2port02 (1.4.112); FILE MERGED
2007/10/04 19:45:57 ydario 1.4.112.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/inc/internal/global.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shell/inc/internal/global.hxx b/shell/inc/internal/global.hxx index d2b8bcc3f1e8..43924185b764 100644 --- a/shell/inc/internal/global.hxx +++ b/shell/inc/internal/global.hxx @@ -4,9 +4,9 @@ * * $RCSfile: global.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-19 14:13:08 $ + * last change: $Author: hr $ $Date: 2007-11-02 13:09:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,9 @@ #if defined _MSC_VER #pragma warning(push, 1) #endif +#ifndef OS2 #include <windows.h> +#endif #if defined _MSC_VER #pragma warning(pop) #endif |