Merge pull request #5571 from jas0n1ee:master

This commit is contained in:
Maksim Shabunin 2015-11-23 09:52:41 +00:00
commit 9a66191ea8

View File

@ -270,7 +270,7 @@
*/ */
#if !defined _MSC_VER && !defined __BORLANDC__ #if !defined _MSC_VER && !defined __BORLANDC__
# if defined __cplusplus && __cplusplus >= 201103L # if defined __cplusplus && __cplusplus >= 201103L && !defined __APPLE__
# include <cstdint> # include <cstdint>
typedef std::uint32_t uint; typedef std::uint32_t uint;
# else # else