merge from trunk r4950: _mingw.h (__int128, __SIZEOF_INT128__): Handle clang.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v2.x@5336 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index b13c38d..8bebaf1 100644
--- a/mingw-w64-crt/revstamp.h
+++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@
/* Do not edit. Autogenerated. */
-#define __MINGW_W64_REV "5306"
-#define __MINGW_W64_REV_STAMP "2012-08-01"
+#define __MINGW_W64_REV "5336"
+#define __MINGW_W64_REV_STAMP "2012-08-07"
diff --git a/mingw-w64-headers/crt/ChangeLog b/mingw-w64-headers/crt/ChangeLog
index 851e0ba..1b6ce84 100644
--- a/mingw-w64-headers/crt/ChangeLog
+++ b/mingw-w64-headers/crt/ChangeLog
@@ -8,6 +8,10 @@
* setjmp.h (setjmp): Use frame-address builtin.
+2012-04-10 Ozkan Sezer <sezeroz@gmail.com>
+
+ * _mingw.h (__int128, __SIZEOF_INT128__): Handle clang.
+
2012-04-03 Ozkan Sezer <sezeroz@gmail.com>
Merge from trunk rev. 4927:
diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in
index bf71223..5cb9924 100644
--- a/mingw-w64-headers/crt/_mingw.h.in
+++ b/mingw-w64-headers/crt/_mingw.h.in
@@ -260,6 +260,10 @@
#define __int32 int
#define __int64 long long
#ifdef _WIN64
+#if (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) && \
+ !defined(__SIZEOF_INT128__) /* clang >= 3.1 has __int128 but no size macro */
+#define __SIZEOF_INT128__ 16
+#endif
#ifndef __SIZEOF_INT128__
typedef int __int128 __attribute__ ((__mode__ (TI)));
#endif
