diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:17:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:17:09 +0200 |
| commit | 85e3c53e5c5e2de993c90ece324a68d0ff62f417 (patch) | |
| tree | 6f078576f01f18afcdae773e48664640ce795abe /src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch | |
| parent | 2e749c089f6fd93909e7cd4cc8129f2969b35185 (diff) | |
| parent | 7f943968ade6a65321d4a00822f5b3a034a19e0c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c
Diffstat (limited to 'src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch')
| -rw-r--r-- | src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch b/src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch new file mode 100644 index 0000000000..ebe3de4dc9 --- /dev/null +++ b/src/angle/patches/0010-Add-missing-intrin.h-include-for-__cpuid.patch @@ -0,0 +1,30 @@ +From 142312b5cbea10257b6d3693b48817ae657018eb Mon Sep 17 00:00:00 2001 +From: Kai Koehne <kai.koehne@digia.com> +Date: Mon, 22 Apr 2013 16:36:17 +0200 +Subject: [PATCH] Add missing intrin.h include for __cpuid + +This is already fixed upstream in + +https://codereview.appspot.com/8615046/patch/1/2 + +Change-Id: I4b9e865f6b5622c484418a8381334381bc256887 +--- + src/3rdparty/angle/src/libGLESv2/mathutil.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/3rdparty/angle/src/libGLESv2/mathutil.h b/src/3rdparty/angle/src/libGLESv2/mathutil.h +index 672c443..bb48b94 100644 +--- a/src/3rdparty/angle/src/libGLESv2/mathutil.h ++++ b/src/3rdparty/angle/src/libGLESv2/mathutil.h +@@ -9,6 +9,8 @@ + #ifndef LIBGLESV2_MATHUTIL_H_ + #define LIBGLESV2_MATHUTIL_H_ + ++#include <intrin.h> ++ + #include "common/system.h" + #include "common/debug.h" + +-- +1.8.1.msysgit.1 + |