temporarily revert to query "defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER)"

svn path=/trunk/; revision=44999
This commit is contained in:
Martin Fuchs 2010-01-08 14:48:22 +00:00
parent e09bb852c0
commit 873a68e758
2 changed files with 4 additions and 6 deletions

View file

@ -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

View file

@ -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