Author: martinf
Date: Fri Jan 8 15:48:22 2010
New Revision: 44999
URL: http://svn.reactos.org/svn/reactos?rev=44999&view=rev
Log:
temporarily revert to query "defined(__STDC_WANT_SECURE_LIB__) &&
defined(_MS_VER)"
Modified:
trunk/reactos/base/shell/explorer/utility/utility.h
trunk/reactos/base/shell/explorer/utility/xmlstorage.h
Modified: trunk/reactos/base/shell/explorer/utility/utility.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utility/utility.h?rev=44999&r1=44998&r2=44999&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Fri Jan 8
15:48:22 2010
@@ -182,12 +182,9 @@
#endif
-#ifndef _MS_VER // modified gedmurphy's "secure CRT usage rehack"
-#undef __STDC_WANT_SECURE_LIB__
-#endif
-
// secure CRT functions
-#ifdef __STDC_WANT_SECURE_LIB__ // for VS 2005: _MSC_VER>=1400
+//@@ _MS_VER: temporarily needed for the ReactOS build environment
+#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) // for VS 2005:
_MSC_VER>=1400
#define _stprintf_s1 _stprintf_s
#define _stprintf_s2 _stprintf_s
Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utility/xmlstorage.h?rev=44999&r1=44998&r2=44999&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1]
(original)
+++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] Fri Jan
8 15:48:22 2010
@@ -518,7 +518,8 @@
{
FileHolder(LPCTSTR path, LPCTSTR mode)
{
-#ifdef __STDC_WANT_SECURE_LIB__
+//@@ _MS_VER: temporarily needed for the ReactOS build environment
+#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER) // secure CRT
functions using VS 2005
if (_tfopen_s(&_pfile, path, mode) != 0)
_pfile = NULL;
#else
