[ros-diffs] [gedmurphy] 44929: Rehack the explorer hack for secure CRT usage. This should fix the build, unless there are any more oddities in our tree.

Author: gedmurphy
Date: Mon Jan  4 17:10:33 2010
New Revision: 44929

URL: http://svn.reactos.org/svn/reactos?rev=44929&view=rev
Log:
Rehack the explorer hack for secure CRT usage.
This should fix the build, unless there are any more oddities in our tree.

Modified:
    trunk/reactos/base/shell/explorer/utility/utility.cpp
    trunk/reactos/base/shell/explorer/utility/utility.h
    trunk/reactos/base/shell/explorer/utility/xmlstorage.h

Modified: trunk/reactos/base/shell/explorer/utility/utility.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit…
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/utility.cpp [iso-8859-1] Mon Jan  4 17:10:33
2010
@@ -158,7 +158,7 @@
 
 BOOL time_to_filetime(const time_t* t, FILETIME* ftime)
 {
-#ifdef __STDC_WANT_SECURE_LIB__
+#if defined(__STDC_WANT_SECURE_LIB__) && defined(_MS_VER)
 	SYSTEMTIME stime;
 	struct tm tm_;
 	struct tm* tm = &tm_;

Modified: trunk/reactos/base/shell/explorer/utility/utility.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit…
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Mon Jan  4 17:10:33
2010
@@ -183,7 +183,7 @@
 
 
  // secure CRT functions
-#ifdef __STDC_WANT_SECURE_LIB__	// for VS 2005: _MSC_VER>=1400
+#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/utilit…
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] Mon Jan  4
17:10:33 2010
@@ -512,7 +512,7 @@
 {
 	FileHolder(LPCTSTR path, LPCTSTR mode)
 	{
-#ifdef __STDC_WANT_SECURE_LIB__	// secure CRT functions using VS 2005
+#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