diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:49:25 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:49:25 +0000 |
| commit | b6c3213a38c0d76887917dc95efe84d42f324c22 (patch) | |
| tree | c9623b943464f3fef2fb7470a3941c2744761af1 /setup_native | |
| parent | 3b8d6db5289bf3652d05dbbc59eb29a0eec6fae7 (diff) | |
INTEGRATION: CWS obo12 (1.15.6); FILE MERGED
2007/05/30 12:21:13 obo 1.15.6.3: RESYNC: (1.15-1.16); FILE MERGED
2007/05/10 13:25:22 obo 1.15.6.2: #i76713# _WIN32_WINDOWS = 0x0410 for Win98
2007/05/10 10:43:04 obo 1.15.6.1: #i76713# #error YES removed (Vista PSDK)
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index aae00f4d52cc..3d4bcadb2ecd 100755 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -4,9 +4,9 @@ * * $RCSfile: swappatchfiles.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: gm $ $Date: 2007-05-10 11:03:07 $ + * last change: $Author: ihi $ $Date: 2007-06-05 10:49:25 $ * * 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> @@ -53,10 +55,6 @@ #include <queue> #include <stdio.h> -#if defined(_WIN32_WINNT) && !defined(__MINGW32__) -#error YES -#endif - #include <systools/win32/uwinapi.h> #include <../tools/seterror.hxx> |