Author: amassari
Date: Wed May 1 19:07:18 2013
New Revision: 1478145
URL: http://svn.apache.org/r1478145
Log:
The Windows SDK 7.0 introduced two new headers designed to be included in the
resource scripts to avoid including function definitions that use a syntax that
the RC compiler doesn't understand. For the moment, we can detect the case
where VS2012 + WindowsSDK 7.1 + XP mode is used, that is the one that causes an
error in compilation (XERCESC-2011)
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc?rev=1478145&r1=1478144&r2=1478145&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc Wed May 1
19:07:18 2013
@@ -7,8 +7,13 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
+#ifdef _USING_V110_SDK71_
+#include "VerRsrc.h"
+#include "winnt.rh"
+#else
#include "winver.h"
#include "winnt.h"
+#endif
/////////////////////////////////////////////////////////////////////////////
@@ -83,8 +88,13 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""winver.h""\r\n"
- "#include ""winnt.h""\r\n"
+ "#ifdef _USING_V110_SDK71_\r\n"
+ "#include ""VerRsrc.h""\r\n"
+ "#include ""winnt.rh""\r\n"
+ "#else\r\n"
+ "#include ""winver.h""\r\n"
+ "#include ""winnt.h""\r\n"
+ "#endif\r\n"
"\r\n"
"\0"
END
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
