aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-28 20:48:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-28 20:48:30 +0000
commit22b8fe96663de518bf77049a1e449430b66e7d11 (patch)
treeea84c2366348ec81877fb4525e239070b74f51eb
parent88c30fb652ad40835f1d1045e2c851ff8813e873 (diff)
parentdab56cac959ce9c78e3a0a22e9ee2ff917d61bd3 (diff)
downloadbootable_recovery-22b8fe96663de518bf77049a1e449430b66e7d11.zip
bootable_recovery-22b8fe96663de518bf77049a1e449430b66e7d11.tar.gz
bootable_recovery-22b8fe96663de518bf77049a1e449430b66e7d11.tar.bz2
am dab56cac: Merge "Add missing includes."
* commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3': Add missing includes.
-rw-r--r--applypatch/bspatch.c1
-rw-r--r--asn1_decoder.cpp1
-rw-r--r--install.cpp1
-rw-r--r--verifier.cpp5
4 files changed, 6 insertions, 2 deletions
diff --git a/applypatch/bspatch.c b/applypatch/bspatch.c
index b34ec2a..b57760e 100644
--- a/applypatch/bspatch.c
+++ b/applypatch/bspatch.c
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <sys/stat.h>
#include <errno.h>
+#include <malloc.h>
#include <unistd.h>
#include <string.h>
diff --git a/asn1_decoder.cpp b/asn1_decoder.cpp
index 7280f74..e7aef78 100644
--- a/asn1_decoder.cpp
+++ b/asn1_decoder.cpp
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include <malloc.h>
#include <stdint.h>
#include <string.h>
diff --git a/install.cpp b/install.cpp
index 9db5640..31606bb 100644
--- a/install.cpp
+++ b/install.cpp
@@ -18,6 +18,7 @@
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <unistd.h>
diff --git a/verifier.cpp b/verifier.cpp
index eeff95a..61e5adf 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -26,9 +26,10 @@
#include "mincrypt/sha.h"
#include "mincrypt/sha256.h"
-#include <string.h>
-#include <stdio.h>
#include <errno.h>
+#include <malloc.h>
+#include <stdio.h>
+#include <string.h>
extern RecoveryUI* ui;