diff options
| -rw-r--r-- | chrome/browser/metrics/extension_metrics.cc | 6 | ||||
| -rw-r--r-- | components/rappor/bloom_filter.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/chrome/browser/metrics/extension_metrics.cc b/chrome/browser/metrics/extension_metrics.cc index 192aa5e..b57a6f0 100644 --- a/chrome/browser/metrics/extension_metrics.cc +++ b/chrome/browser/metrics/extension_metrics.cc @@ -14,11 +14,7 @@ #include "chrome/common/metrics/proto/system_profile.pb.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension_set.h" - -// From third_party/smhasher/src/City.h; that file can't be included here due -// to macro redefinitions (of UINT8_C, etc.) on Windows. -// TODO(mvrable): Clean up City.h so it can be included directly. -uint64 CityHash64(const char *buf, size_t len); +#include "third_party/smhasher/src/City.h" namespace { diff --git a/components/rappor/bloom_filter.cc b/components/rappor/bloom_filter.cc index 2880ae0..d3f9e63 100644 --- a/components/rappor/bloom_filter.cc +++ b/components/rappor/bloom_filter.cc @@ -5,9 +5,7 @@ #include "components/rappor/bloom_filter.h" #include "base/logging.h" - -// TODO(holte): we can't include "City.h" due to typedef conflicts. -extern uint64 CityHash64WithSeed(const char *buf, size_t len, uint64 seed); +#include "third_party/smhasher/src/City.h" namespace rappor { 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 { |