From 6896d7f921d0f0bf1abfd65b25fbe97cb9c7f1c8 Mon Sep 17 00:00:00 2001 From: "mvrable@chromium.org" Date: Mon, 28 Apr 2014 20:24:15 +0000 Subject: 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 --- gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gpu') 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 { -- cgit v1.1