commit 9188a4c63881f5c26283ac05132f97a408a67462
author Dylan Reid <dgreid@chromium.org> Wed Feb 15 20:31:55 2017
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sat Mar 04 03:35:47 2017
tree 4dd4f6aa7f9b8acaeab01d051b1811aacaccac34
parent e9cefd2ebfa0a5fc25932cc1088663d39c27e549

UPSTREAM: Make city.h includes consistent

Most of the code base already uses <misc/city.h>.  Modify the places
that include "city.h" to follow that pattern.  cmake doesn't add misc to
the include paths passed to the compiler.  I ran into "can't find
city.h" errors when attempting to add an ebuild for gentoo.

Change-Id: I1e07d82bbe58fbae4759263734ac22170220eeb7
Signed-off-by: Dylan Reid <dgreid@chromium.org>
(cherry picked from commit c2416e1996f694ea0cefb217f806e45931ef0b03)
Reviewed-on: https://chromium-review.googlesource.com/448946
Reviewed-by: Slava Malyugin <slavamn@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>

ntirpc/misc/citycrc.h

diff --git a/ntirpc/misc/citycrc.h b/ntirpc/misc/citycrc.h
index 5706934..d362015 100644
--- a/ntirpc/misc/citycrc.h
+++ b/ntirpc/misc/citycrc.h
@@ -34,7 +34,7 @@
 #ifndef CITY_HASH_CRC_H_
 #define CITY_HASH_CRC_H_
 
-#include "city.h"
+#include <misc/city.h>
 
 /* Hash function for a byte array. */
 uint128 CityHashCrc128(const char *s, size_t len);

src/city-test.c

diff --git a/src/city-test.c b/src/city-test.c
index 03d98a2..8b504dd 100644
--- a/src/city-test.c
+++ b/src/city-test.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "city.h"
+#include <misc/city.h>
 #ifdef __SSE4_2__
 #include "citycrc.h"
 #endif

src/citycrc.h

diff --git a/src/citycrc.h b/src/citycrc.h
index f6cab94..7998521 100644
--- a/src/citycrc.h
+++ b/src/citycrc.h
@@ -33,7 +33,7 @@
 #ifndef CITY_HASH_CRC_H_
 #define CITY_HASH_CRC_H_
 
-#include "city.h"
+#include <misc/city.h>
 
 /* Hash function for a byte array. */
 uint128 CityHashCrc128(const char *s, size_t len);