From b249cfa8375d7cd8c8005e814cad5a688ff0258c Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Sun, 28 Feb 2010 09:17:39 +0000 Subject: [PATCH] Merge version with mingw-w64 trunk version. svn path=/branches/header-work/; revision=45720 --- include/crt/yvals.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/crt/yvals.h b/include/crt/yvals.h index 9f994129243..10b812dac62 100644 --- a/include/crt/yvals.h +++ b/include/crt/yvals.h @@ -1,11 +1,13 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #ifndef _YVALS #define _YVALS +#include <_mingw.h> +/* TODO, don't include crtdef.h. */ #include #pragma pack(push,_CRT_PACKING) @@ -168,10 +170,10 @@ typedef bool _Bool; _STD_END #endif -#define _LONGLONG __int64 -#define _ULONGLONG unsigned __int64 -#define _LLONG_MAX 0x7fffffffffffffff -#define _ULLONG_MAX 0xffffffffffffffff +#define _LONGLONG /* __MINGW_EXTENSION */ __int64 +#define _ULONGLONG /* __MINGW_EXTENSION */ unsigned __int64 +#define _LLONG_MAX 0x7fffffffffffffffLL +#define _ULLONG_MAX 0xffffffffffffffffULL #define _C2 1 @@ -179,8 +181,8 @@ _STD_END #define _MAX_INT_DIG 32 #define _MAX_SIG_DIG 36 -typedef _LONGLONG _Longlong; -typedef _ULONGLONG _ULonglong; +__MINGW_EXTENSION typedef _LONGLONG _Longlong; +__MINGW_EXTENSION typedef _ULONGLONG _ULonglong; #define _Filet _iobuf