am c1d80272: am 08da5c1f: Merge "vold: replace strsep by strtok_r"
* commit 'c1d80272b117cf837de93fadd8d456d89a203e2f':
vold: replace strsep by strtok_r
diff --git a/CommandListener.cpp b/CommandListener.cpp
index b0fc551..bc6b9e0 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -22,6 +22,7 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
+#include <string.h>
#define LOG_TAG "VoldCmdListener"
#include <cutils/log.h>
@@ -504,4 +505,3 @@
return 0;
}
-
diff --git a/Devmapper.cpp b/Devmapper.cpp
index c9482bf..9a22a64 100644
--- a/Devmapper.cpp
+++ b/Devmapper.cpp
@@ -15,6 +15,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
@@ -292,4 +293,3 @@
return (void *) (((unsigned long) ptr + agn) & ~agn);
}
-
diff --git a/Fat.cpp b/Fat.cpp
index 4754c66..82a3f7a 100644
--- a/Fat.cpp
+++ b/Fat.cpp
@@ -15,6 +15,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
@@ -30,6 +31,7 @@
#include <sys/mount.h>
#include <linux/kdev_t.h>
+#include <linux/fs.h>
#define LOG_TAG "Vold"
diff --git a/Loop.cpp b/Loop.cpp
index 98015e2..fdba249 100644
--- a/Loop.cpp
+++ b/Loop.cpp
@@ -15,6 +15,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
@@ -22,6 +23,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <linux/kdev_t.h>
diff --git a/NetlinkHandler.cpp b/NetlinkHandler.cpp
index f47d364..55b6dba 100644
--- a/NetlinkHandler.cpp
+++ b/NetlinkHandler.cpp
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <string.h>
#define LOG_TAG "Vold"
diff --git a/Volume.cpp b/Volume.cpp
index ecf7dcd..d67a6c4 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -27,6 +27,7 @@
#include <sys/mount.h>
#include <linux/kdev_t.h>
+#include <linux/fs.h>
#include <cutils/properties.h>