_USE_32BIT_TIME_T resolution and prepare for release.

[mingw/mingw-org-wsl.git] / include / sys / timeb.h

diff --git a/include/sys/timeb.h b/include/sys/timeb.h
index 12124cc..b55d1f8 100644 (file)
--- a/include/sys/timeb.h
+++ b/include/sys/timeb.h
@@ -21,21 +21,15 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#ifndef        _TIMEB_H_
+#define        _TIMEB_H_
+#pragma GCC system_header
+#include <_mingw.h>
+
 /*
- * timeb.h
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER within the package.
- *
  * Support for the UNIX System V ftime system call.
- *
  */
 
-#ifndef        _TIMEB_H_
-#define        _TIMEB_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
 #include <sys/types.h>
 
 #ifndef        RC_INVOKED
@@ -51,7 +45,6 @@ struct _timeb
        short   dstflag;
 };
 
-#if __MSVCRT_VERSION__ >= 0x0800
 /*
  * TODO: Structure not tested.
  */
@@ -62,7 +55,6 @@ struct __timeb32
        short   timezone;
        short   dstflag;
 };
-#endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
 #ifndef        _NO_OLDNAMES
 /*
@@ -85,12 +77,10 @@ extern "C" {
 _CRTIMP void __cdecl __MINGW_NOTHROW   _ftime (struct _timeb*);
 
 #ifndef        _NO_OLDNAMES
-/* FIXME for __MSVCRT_VERSION__ >= 0x0800 */
 _CRTIMP void __cdecl __MINGW_NOTHROW   ftime (struct timeb*);
 #endif /* Not _NO_OLDNAMES */
 
 /* This requires newer versions of msvcrt.dll (6.10 or higher).  */ 
-#if __MSVCRT_VERSION__ >= 0x0601
 struct __timeb64
 {
   __time64_t time;
@@ -100,16 +90,15 @@ struct __timeb64
 };
 
 _CRTIMP void __cdecl __MINGW_NOTHROW   _ftime64 (struct __timeb64*);
-#endif /* __MSVCRT_VERSION__ >= 0x0601 */
 
-#if __MSVCRT_VERSION__ >= 0x0800
 _CRTIMP void __cdecl __MINGW_NOTHROW   _ftime32 (struct __timeb32*);
-#ifndef _USE_32BIT_TIME_T
-_CRTALIAS void __cdecl __MINGW_NOTHROW _ftime (struct _timeb* _v) { return(_ftime64 ((struct __timeb64*)_v)); }
-#else
+
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 _CRTALIAS void __cdecl __MINGW_NOTHROW _ftime (struct _timeb* _v) { return(_ftime32 ((struct __timeb32*)_v)); }
+#else
+
+_CRTALIAS void __cdecl __MINGW_NOTHROW _ftime (struct _timeb* _v) { return(_ftime64 ((struct __timeb64*)_v)); }
 #endif
-#endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
 #ifdef __cplusplus
 }