diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-12-20 18:21:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-12-20 18:27:35 +0100 |
| commit | 032d5ba4fa3389b968ceb0b6c3de587f979f3c04 (patch) | |
| tree | e34546b32d3be41422c409519a5da78718ec2897 /extensions/source/ole/unoobjw.cxx | |
| parent | Partially reverted 786f15e605867668d88ab23d66cabb18f18bdcf9 (diff) | |
| download | core-032d5ba4fa3389b968ceb0b6c3de587f979f3c04.tar.gz core-032d5ba4fa3389b968ceb0b6c3de587f979f3c04.zip | |
extensions: oleautobridge: avoid boatloads of warning C4005
... "macro redefinition" mostly from tools/postsys.h by wrapping all
inclusion of namespace polluting native windows headers in a single new
winwrap.hxx that is then included by the other headers; also cleans up
some inconsistent definitions of _WIN32_WINNT
Change-Id: Ibfe82a531615d559db2e61e4cdf399e68d0b3223
Diffstat (limited to 'extensions/source/ole/unoobjw.cxx')
| -rw-r--r-- | extensions/source/ole/unoobjw.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 069da1ed98b7..a391d64a907d 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -17,19 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010 -#define _WIN32_WINNT 0x403 - - #include "ole2uno.hxx" +#if _WIN32_WINNT != 0x403 +#error wrong _WIN32_WINNT +#endif #include <stdio.h> -#include <tools/presys.h> -#include <olectl.h> #include <vector> #include <list> #include <boost/unordered_map.hpp> -#include <tools/postsys.h> #include <osl/diagnose.h> |