diff options
| author | mvrable@chromium.org <mvrable@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 20:24:15 +0000 |
|---|---|---|
| committer | mvrable@chromium.org <mvrable@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 20:24:15 +0000 |
| commit | 6896d7f921d0f0bf1abfd65b25fbe97cb9c7f1c8 (patch) | |
| tree | 2a77fadd974c225b138affe4c3ef660ca23ec510 /gpu | |
| parent | e445fc1edea19cb22d0df2123eff565c92f65dca (diff) | |
| download | chromium_src-6896d7f921d0f0bf1abfd65b25fbe97cb9c7f1c8.zip chromium_src-6896d7f921d0f0bf1abfd65b25fbe97cb9c7f1c8.tar.gz chromium_src-6896d7f921d0f0bf1abfd65b25fbe97cb9c7f1c8.tar.bz2 | |
Add proper includes for usage of the CityHash functions.
Previously function declarations needed to be added manually because of
build errors on Windows when including the City.h file. Now, with the
build errors fixed, use the proper includes everywhere.
BUG=353157
Review URL: https://codereview.chromium.org/246013008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 3553a7a..a6306dfa 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -57,6 +57,7 @@ #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/command_buffer/service/vertex_array_manager.h" #include "gpu/command_buffer/service/vertex_attrib_manager.h" +#include "third_party/smhasher/src/City.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_fence.h" #include "ui/gl/gl_image.h" @@ -71,9 +72,6 @@ #include "base/win/win_util.h" #endif -// TODO(zmo): we can't include "City.h" due to type def conflicts. -extern uint64 CityHash64(const char*, size_t); - namespace gpu { namespace gles2 { |