diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:50:00 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:50:00 +0000 |
| commit | 69b390099b7426bb0d129560b52b862d1a80b810 (patch) | |
| tree | 36deb285c74f49dfb55fc51c1d2fb2673433ccfa /setup_native | |
| parent | 77cf7e052fc97b28e682c1ffb72cd55c0c6ff207 (diff) | |
INTEGRATION: CWS obo12 (1.4.8); FILE MERGED
2007/05/10 13:16:34 obo 1.4.8.2: #i76713# _WIN32_WINDOWS = 0x0410 for Win98
2007/05/10 10:35:57 obo 1.4.8.1: #i76713# #error YES removed (Vista PSDK)
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx index 0a2781fa0c0e..74e660322824 100755 --- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx +++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx @@ -4,9 +4,9 @@ * * $RCSfile: migrateinstallpath.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:11:29 $ + * last change: $Author: ihi $ $Date: 2007-06-05 10:50:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,6 +33,7 @@ * ************************************************************************/ +#define _WIN32_WINDOWS 0x0410 #pragma warning(push, 1) /* disable warnings within system headers */ #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -50,10 +51,6 @@ #include <tchar.h> #include <string> -#if defined(_WIN32_WINNT) && !defined(__MINGW32__) -#error YES -#endif - using namespace std; namespace |