diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:50:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:50:55 +0000 |
| commit | 15f2c44347ef06f8f8cbcec30f2c8e2bfd1a5652 (patch) | |
| tree | 401edd1dbb3686ff2a5d4423ba559f7e76424497 /setup_native | |
| parent | 545e9a6e8d7127c5eeb1791f25b5ec9b54057406 (diff) | |
INTEGRATION: CWS obo12 (1.7.8); FILE MERGED
2007/05/10 13:20:33 obo 1.7.8.2: #i76713# _WIN32_WINDOWS = 0x0410 for Win98
2007/05/10 10:38:43 obo 1.7.8.1: #i76713# #error YES removed (Vista PSDK)
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx index d9264e89ce41..683815b8b2ea 100644 --- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx +++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx @@ -4,9 +4,9 @@ * * $RCSfile: startmenuicon.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:12:03 $ + * last change: $Author: ihi $ $Date: 2007-06-05 10:50:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,6 +33,8 @@ * ************************************************************************/ +#define _WIN32_WINDOWS 0x0410 + #pragma warning(push, 1) /* disable warnings within system headers */ #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -50,10 +52,6 @@ #include <tchar.h> #include <string> -#if defined(_WIN32_WINNT) && !defined(__MINGW32__) -#error YES -#endif - std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty ) { |