diff options
| author | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 04:35:18 +0000 |
|---|---|---|
| committer | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 04:35:18 +0000 |
| commit | 33aaf596dc33ca4ead7715abb712858d9bd25260 (patch) | |
| tree | 84b9dadc454ac6835102ff8ab478b679bbbb9fa4 /third_party/mesa/MesaLib/src/glsl/ir.h | |
| parent | 880c6cd8b8dc5564156deb9c94dbb0a43346cf87 (diff) | |
| download | chromium_src-33aaf596dc33ca4ead7715abb712858d9bd25260.zip chromium_src-33aaf596dc33ca4ead7715abb712858d9bd25260.tar.gz chromium_src-33aaf596dc33ca4ead7715abb712858d9bd25260.tar.bz2 | |
Fix the compile errors for mesa on Android
There are some compile errors for mesa when trying to build gpu_tests
on Android. They were fixed in the mesa upstream.
So this patch combines 3 commits from mesa upstream. They are:
1) Commit eb0ff1a1c0 by chad@chad-versace.us: remove the use of
fpu_control.h
2) Commit 504f92c739 by olvaffe@gmail.com: android has no log2f
nor ffs
3) Commit 497baf4e4a by ian.d.romanick@intel.com: Use C-style
system headers in C++ code to avoid issues with std:: namespace
BUG=138226
TEST=
Review URL: https://chromiumcodereview.appspot.com/10825442
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa/MesaLib/src/glsl/ir.h')
| -rw-r--r-- | third_party/mesa/MesaLib/src/glsl/ir.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/mesa/MesaLib/src/glsl/ir.h b/third_party/mesa/MesaLib/src/glsl/ir.h index 5aa7c6d..456c43f 100644 --- a/third_party/mesa/MesaLib/src/glsl/ir.h +++ b/third_party/mesa/MesaLib/src/glsl/ir.h @@ -26,8 +26,8 @@ #ifndef IR_H #define IR_H -#include <cstdio> -#include <cstdlib> +#include <stdio.h> +#include <stdlib.h> extern "C" { #include <talloc.h> |