[ros-diffs] [tkreuzer] 47483: remove WTIME_S_DEFINED guard and move the functions from wchar_s to wchar.h (like in MS headers)

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Mon May 31 05:32:51 2010
New Revision: 47483

URL: http://svn.reactos.org/svn/reactos?rev=47483&view=rev
Log:
remove WTIME_S_DEFINED guard and move the functions from wchar_s to wchar.h (like in MS headers)

Modified:
    trunk/reactos/include/crt/sec_api/wchar_s.h
    trunk/reactos/include/crt/wchar.h

Modified: trunk/reactos/include/crt/sec_api/wchar_s.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/wchar_s.h?rev=47483&r1=47482&r2=47483&view=diff
==============================================================================
--- trunk/reactos/include/crt/sec_api/wchar_s.h [iso-8859-1] (original)
+++ trunk/reactos/include/crt/sec_api/wchar_s.h [iso-8859-1] Mon May 31 05:32:51 2010
@@ -96,16 +96,6 @@
   _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale);
 #endif
 
-#ifndef _WTIME_S_DEFINED
-#define _WTIME_S_DEFINED
-  _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm);
-  _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time);
-  _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords);
-  _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords);
-#if _INTEGRAL_MAX_BITS >= 64
-  _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time);
-#endif
-
 #if !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL)
 #define _INC_WTIME_S_INL
 #ifdef _USE_32BIT_TIME_T

Modified: trunk/reactos/include/crt/wchar.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=47483&r1=47482&r2=47483&view=diff
==============================================================================
--- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original)
+++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Mon May 31 05:32:51 2010
@@ -751,19 +751,27 @@
   _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale);
   _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer);
   _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer);
+
+  _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm);
+  _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time);
+  _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords);
+  _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords);
+
 #if _INTEGRAL_MAX_BITS >= 64
   _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time);
+  _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time);
 #endif
 
 #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL)
 #define _INC_WTIME_INL
 #ifdef _USE_32BIT_TIME_T
 __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime32(_Time); }
-#else
+#else /* !_USE_32BIT_TIME_T */
 __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_Time); }
-#endif
-#endif
-#endif
+#endif /* !_USE_32BIT_TIME_T */
+#endif /* !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) */
+
+#endif /* _WTIME_DEFINED */
 
   typedef int mbstate_t;
   typedef wchar_t _Wint_t;