summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-04-01 19:48:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 19:48:52 +0000
commita231a1287815e80a5ab11e30254005b81254d891 (patch)
tree0385a7210e0c2ba7a33fa336ac35fecf24634fa1
parentdfca41d3a89e2c6e61c6749b5f5af670bdf90891 (diff)
parent0f9bf17ad6caf7cec9043b1330cd3387b8881c0f (diff)
downloadframeworks_native-a231a1287815e80a5ab11e30254005b81254d891.zip
frameworks_native-a231a1287815e80a5ab11e30254005b81254d891.tar.gz
frameworks_native-a231a1287815e80a5ab11e30254005b81254d891.tar.bz2
am 0f9bf17a: am 23b204e1: Merge "servicemanager: service_manager missing include for string.h"
* commit '0f9bf17ad6caf7cec9043b1330cd3387b8881c0f': servicemanager: service_manager missing include for string.h
-rw-r--r--cmds/servicemanager/service_manager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index df46a60..0abdf83 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -1,10 +1,11 @@
/* Copyright 2008 The Android Open Source Project
*/
-#include <stdio.h>
-#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <private/android_filesystem_config.h>