diff options
Diffstat (limited to 'src/angle/patches/0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch')
| -rw-r--r-- | src/angle/patches/0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/angle/patches/0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch b/src/angle/patches/0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch index 1a06cd0bec..c796ebc95e 100644 --- a/src/angle/patches/0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch +++ b/src/angle/patches/0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch @@ -1,7 +1,7 @@ -From 0cd67655973e4e05f041bbfaafc8ce376cc8332c Mon Sep 17 00:00:00 2001 +From 76152feea8265f40fec8c6e53f976dbd82fb6c80 Mon Sep 17 00:00:00 2001 From: Thiago Macieira <thiago.macieira@intel.com> -Date: Fri, 4 Jul 2014 09:20:06 +0300 -Subject: [PATCH 07/12] Fix ANGLE build with Microsoft Visual Studio "14" CTP +Date: Tue, 16 Sep 2014 23:56:43 +0300 +Subject: [PATCH 07/16] Fix ANGLE build with Microsoft Visual Studio "14" CTP This version has a few new C99 support added, including snprintf. @@ -11,12 +11,12 @@ Change-Id: I5776456fd94254a64f08791f59bc775cb24c9b7f 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/angle/src/common/angleutils.h b/src/3rdparty/angle/src/common/angleutils.h -index 7701a42..d94b4f5 100644 +index 50a4132..ddbbd5f 100644 --- a/src/3rdparty/angle/src/common/angleutils.h +++ b/src/3rdparty/angle/src/common/angleutils.h -@@ -131,7 +131,7 @@ inline std::string Str(int i) - return strstr.str(); - } +@@ -135,7 +135,7 @@ inline std::string Str(int i) + std::string FormatString(const char *fmt, va_list vararg); + std::string FormatString(const char *fmt, ...); -#if defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER < 1900 |