From 873a68e758c8f557de3af09e2487af02b363d734 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Fri, 8 Jan 2010 14:48:22 +0000 Subject: [PATCH] temporarily revert to query "defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER)" svn path=/trunk/; revision=44999 --- reactos/base/shell/explorer/utility/utility.h | 7 ++----- reactos/base/shell/explorer/utility/xmlstorage.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/reactos/base/shell/explorer/utility/utility.h b/reactos/base/shell/explorer/utility/utility.h index a9fc144ce38..4b7126c0ff4 100644 --- a/reactos/base/shell/explorer/utility/utility.h +++ b/reactos/base/shell/explorer/utility/utility.h @@ -182,12 +182,9 @@ BOOL exists_path(LPCTSTR path); #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 diff --git a/reactos/base/shell/explorer/utility/xmlstorage.h b/reactos/base/shell/explorer/utility/xmlstorage.h index 671ade1164e..1913bdc9012 100644 --- a/reactos/base/shell/explorer/utility/xmlstorage.h +++ b/reactos/base/shell/explorer/utility/xmlstorage.h @@ -518,7 +518,8 @@ struct FileHolder { 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