INTEGRATION: CWS obo12 (1.2.42); FILE MERGED

2007/05/10 13:19:14 obo 1.2.42.2: #i76713# _WIN32_WINDOWS = 0x0410 for Win98
2007/05/10 10:37:57 obo 1.2.42.1: #i76713# #error YES removed (Vista PSDK)
This commit is contained in:
Ivo Hinkelmann 2007-06-05 10:26:59 +00:00
parent dd003bd039
commit 40b24f4e9c

View File

@ -4,9 +4,9 @@
*
* $RCSfile: registerextensions.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: vg $ $Date: 2007-05-25 10:49:10 $
* last change: $Author: ihi $ $Date: 2007-06-05 11:26:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -36,6 +36,8 @@
#undef UNICODE
#undef _UNICODE
#define _WIN32_WINDOWS 0x0410
#pragma warning(push, 1) /* disable warnings within system headers */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@ -54,10 +56,6 @@
#include <tchar.h>
#include <string>
#if defined(_WIN32_WINNT) && !defined(__MINGW32__)
#error YES
#endif
static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
{
std::_tstring result;