commit 53956dcbec46f9eadc55a9d7b9df273743f2fd53
author Elliott Hughes <enh@google.com> Fri Apr 03 00:31:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 03 00:31:40 2015 +0000
tree 7fd1a04747939246a0a3d546ce54d75431d124dc
parent 58f3b105bbc0229677dcb71210c277d0c757b199
parent 7c58e72535b010da86a73bafe3fcd7eb0ec48f3d

am 8e192f62: Merge "Fix Windows strlcpy.c build."

* commit '8e192f626edb59d106d73f8f7894823c47457f82':
  Fix Windows strlcpy.c build.

libcutils/strlcpy.c

diff --git a/libcutils/strlcpy.c b/libcutils/strlcpy.c
index 360abc5..c66246c 100644
--- a/libcutils/strlcpy.c
+++ b/libcutils/strlcpy.c
@@ -14,11 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <features.h>
+#include <sys/types.h>
 
 #if defined(__GLIBC__) || defined(_WIN32)
 
-#include <sys/types.h>
 #include <string.h>
 
 #include <cutils/memory.h>