diff options
author | Chris Tate <ctate@android.com> | 2010-07-28 18:18:28 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 18:18:28 -0700 |
commit | 98d4a5cfd4e3c18ae86e56c12b202aa6a2199d1b (patch) | |
tree | 3f41d254f55925dd7d117c3e413795cc3428b47b /libs/utils | |
parent | e65923f513cb294b309d7af90fa31076f1284618 (diff) | |
parent | 4dc8ead1b4e63165c0a9e65adfbe46159758947a (diff) | |
download | frameworks_base-98d4a5cfd4e3c18ae86e56c12b202aa6a2199d1b.zip frameworks_base-98d4a5cfd4e3c18ae86e56c12b202aa6a2199d1b.tar.gz frameworks_base-98d4a5cfd4e3c18ae86e56c12b202aa6a2199d1b.tar.bz2 |
am 4dc8ead1: am 7b40518e: Merge "Change unistd.h to stddef.h to be correct" into gingerbread
Merge commit '4dc8ead1b4e63165c0a9e65adfbe46159758947a'
* commit '4dc8ead1b4e63165c0a9e65adfbe46159758947a':
Change unistd.h to stddef.h to be correct
Diffstat (limited to 'libs/utils')
-rw-r--r-- | libs/utils/StreamingZipInflater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/utils/StreamingZipInflater.cpp b/libs/utils/StreamingZipInflater.cpp index c13760a..4e05914 100644 --- a/libs/utils/StreamingZipInflater.cpp +++ b/libs/utils/StreamingZipInflater.cpp @@ -20,7 +20,7 @@ #include <utils/FileMap.h> #include <utils/StreamingZipInflater.h> #include <string.h> -#include <unistd.h> +#include <stddef.h> #include <assert.h> static inline size_t min(size_t a, size_t b) { return (a < b) ? a : b; } |