Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a4cf11e authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 8c5d9430: Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread 

Merge commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6' into gingerbread-plus-aosp

* commit '8c5d9430d2f029be0c1100f7b3c38a2fb9fe99b6':
  Add unistd.h for size_t typedef to fix sim-eng
parents e9c4f70a 28282dc4

libs/utils/StreamingZipInflater.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <utils/FileMap.h>

#include <utils/FileMap.h>

#include <utils/StreamingZipInflater.h>

#include <utils/StreamingZipInflater.h>

#include <string.h>

#include <string.h>

#include <unistd.h>

#include <assert.h>

#include <assert.h>





static inline size_t min(size_t a, size_t b) { return (a < b) ? a : b; }

static inline size_t min(size_t a, size_t b) { return (a < b) ? a : b; }