summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2018-10-11 17:00:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-11 17:00:53 +0000
commita2ccce870c7ee7a79dace7e26fbf3ecf86e08676 (patch)
tree9a88908395ba333531e0ea911bda236b65816602 /base
parent8ef3fe14bb42b9383b3d1730eb8ef2c3edbd52cc (diff)
parent53f59456090ceec2bf4ff0ecf5634c1d3eaa70c8 (diff)
downloadsystem_core-a2ccce870c7ee7a79dace7e26fbf3ecf86e08676.tar.gz
system_core-a2ccce870c7ee7a79dace7e26fbf3ecf86e08676.tar.bz2
system_core-a2ccce870c7ee7a79dace7e26fbf3ecf86e08676.zip
Merge changes from topic "windows-libcxx"
* changes: Do not enable -Wold-style-cast for Windows Add sys/types.h in utf8.h Adapt to switch to libc++ for Windows
Diffstat (limited to 'base')
-rw-r--r--base/include/android-base/utf8.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/include/android-base/utf8.h b/base/include/android-base/utf8.h
index 4b916232c..1a414ec79 100644
--- a/base/include/android-base/utf8.h
+++ b/base/include/android-base/utf8.h
@@ -17,6 +17,7 @@
#pragma once
#ifdef _WIN32
+#include <sys/types.h>
#include <string>
#else
// Bring in prototypes for standard APIs so that we can import them into the utf8 namespace.