diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 20:26:36 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 20:26:36 +0000 |
| commit | 1ca98fa0e8a26783b2b2c139f0d3638449435a76 (patch) | |
| tree | 577bdae03db60b4affecc3560262f0cca4d392b7 /o3d/import | |
| parent | 2e14ff17f615ba33a778b95370084073a86ff226 (diff) | |
| download | chromium_src-1ca98fa0e8a26783b2b2c139f0d3638449435a76.zip chromium_src-1ca98fa0e8a26783b2b2c139f0d3638449435a76.tar.gz chromium_src-1ca98fa0e8a26783b2b2c139f0d3638449435a76.tar.bz2 | |
linux: fixes for gcc 4.4
Review URL: http://codereview.chromium.org/385125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/cross/archive_processor.cc | 1 | ||||
| -rw-r--r-- | o3d/import/cross/collada_conditioner.cc | 8 | ||||
| -rw-r--r-- | o3d/import/cross/file_output_stream_processor.cc | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/o3d/import/cross/archive_processor.cc b/o3d/import/cross/archive_processor.cc index a10af1b..e400cf1 100644 --- a/o3d/import/cross/archive_processor.cc +++ b/o3d/import/cross/archive_processor.cc @@ -29,6 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <stdio.h> #include <sys/stat.h> #include "import/cross/archive_processor.h" diff --git a/o3d/import/cross/collada_conditioner.cc b/o3d/import/cross/collada_conditioner.cc index c5ec51c..d9c0551b 100644 --- a/o3d/import/cross/collada_conditioner.cc +++ b/o3d/import/cross/collada_conditioner.cc @@ -133,10 +133,10 @@ const PassDeclaration* FindValidTechnique( if (i->pass.size() != 1) continue; const PassDeclaration& pass = i->pass[0]; - if (pass.vertex_shader_profile == "vs_2_0" && - pass.fragment_shader_profile == "ps_2_0" || - pass.vertex_shader_profile == "arbvp1" && - pass.fragment_shader_profile == "arbfp1") { + if ((pass.vertex_shader_profile == "vs_2_0" && + pass.fragment_shader_profile == "ps_2_0") || + (pass.vertex_shader_profile == "arbvp1" && + pass.fragment_shader_profile == "arbfp1")) { return &pass; } } diff --git a/o3d/import/cross/file_output_stream_processor.cc b/o3d/import/cross/file_output_stream_processor.cc index eab955b..10e3579 100644 --- a/o3d/import/cross/file_output_stream_processor.cc +++ b/o3d/import/cross/file_output_stream_processor.cc @@ -32,6 +32,7 @@ // This file contains the declaration of class FileOutputStreamProcessor. +#include <stdio.h> #include "base/logging.h" #include "import/cross/file_output_stream_processor.h" |