am 5b53da0b: am 854c98d6: Merge "Allow stdatomic.h to be included from mingw prebuilt."

* commit '5b53da0bf5b8a0034dd495859d8f83cae671d7e6':
  Allow stdatomic.h to be included from mingw prebuilt.
This commit is contained in:
Hans Boehm 2014-11-13 17:57:24 +00:00 committed by Android Git Automerger
commit 1ba937c063

View File

@ -32,6 +32,12 @@
#include <sys/cdefs.h>
#if defined(__GNUC__) && !defined(__GNUC_PREREQ)
/* Duplicate definition here, since the mingw sys/cdefs.h omits the */
/* definition, and this needs to be usable there. */
#define __GNUC_PREREQ(x, y) \
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
#endif /* __GNUC__ && ... */
#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
# ifdef __clang__