summaryrefslogtreecommitdiffstats
path: root/libs/utils
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-07-28 16:41:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-28 16:41:36 -0700
commitd1548557ab6376868ea669b08d741bac3ce5e6d3 (patch)
treea295342a25e5d82b9ea34c0f960b587a8ff7881d /libs/utils
parentfdbb58cb11ac459ca6ea83725a6314379002ec09 (diff)
parent47cf709aa3c07d2573340187edb5e11ea75824b1 (diff)
downloadframeworks_base-d1548557ab6376868ea669b08d741bac3ce5e6d3.zip
frameworks_base-d1548557ab6376868ea669b08d741bac3ce5e6d3.tar.gz
frameworks_base-d1548557ab6376868ea669b08d741bac3ce5e6d3.tar.bz2
am 47cf709a: am 8c5d9430: Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread
Merge commit '47cf709aa3c07d2573340187edb5e11ea75824b1' * commit '47cf709aa3c07d2573340187edb5e11ea75824b1': Add unistd.h for size_t typedef to fix sim-eng
Diffstat (limited to 'libs/utils')
-rw-r--r--libs/utils/StreamingZipInflater.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/utils/StreamingZipInflater.cpp b/libs/utils/StreamingZipInflater.cpp
index 2ebec93..c13760a 100644
--- a/libs/utils/StreamingZipInflater.cpp
+++ b/libs/utils/StreamingZipInflater.cpp
@@ -20,6 +20,7 @@
#include <utils/FileMap.h>
#include <utils/StreamingZipInflater.h>
#include <string.h>
+#include <unistd.h>
#include <assert.h>
static inline size_t min(size_t a, size_t b) { return (a < b) ? a : b; }