[ros-diffs] [ktietz] 45720: Merge version with mingw-w64 trunk version.

[ktietz at svn.reactos.org]

Author: ktietz
Date: Sun Feb 28 10:17:39 2010
New Revision: 45720

URL: http://svn.reactos.org/svn/reactos?rev=45720&view=rev
Log:
Merge version with mingw-w64 trunk version.

Modified:
    branches/header-work/include/crt/yvals.h

Modified: branches/header-work/include/crt/yvals.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/crt/yvals.h?rev=45720&r1=45719&r2=45720&view=diff
==============================================================================
--- branches/header-work/include/crt/yvals.h [iso-8859-1] (original)
+++ branches/header-work/include/crt/yvals.h [iso-8859-1] Sun Feb 28 10:17:39 2010
@@ -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 <crtdefs.h>
 
 #pragma pack(push,_CRT_PACKING)
@@ -168,10 +170,10 @@
 _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 @@
 #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