diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:12:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:12:16 +0000 |
| commit | 817ac44b80dbd7af9071e27b11c9d09e410b5f54 (patch) | |
| tree | 3ed54ecf67865c6de5bff039dd34f57854c34a47 /setup_native | |
| parent | c2b38053cad5c7d0f8ffda3d65f52f60166fe0e4 (diff) | |
INTEGRATION: CWS mingwport03 (1.4.22); FILE MERGED
2006/09/18 15:19:10 vg 1.4.22.1: #i53572# MinGW port
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/win32/customactions/shellextensions/postuninstall.cxx | 6 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/upgrade.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx index 2a3371756bee..d7fb736558c2 100755 --- a/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx +++ b/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx @@ -4,9 +4,9 @@ * * $RCSfile: postuninstall.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-20 03:41:54 $ + * last change: $Author: vg $ $Date: 2007-03-26 14:11:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,7 +50,7 @@ #include <tchar.h> #include <string> -#ifdef _WIN32_WINNT +#if defined(_WIN32_WINNT) && !defined(__MINGW32__) #error YES #endif diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx index 75f5d6356373..567bf6f7ae8a 100644 --- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx +++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx @@ -4,9 +4,9 @@ * * $RCSfile: upgrade.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-20 03:42:38 $ + * last change: $Author: vg $ $Date: 2007-03-26 14:12:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,7 +48,7 @@ #include <tchar.h> #include <string> -#ifdef _WIN32_WINNT +#if defined(_WIN32_WINNT) && !defined(__MINGW32__) #error YES #endif |