Commit 2c8c2713 authored Jul 28, 2010 by Chris Tate Committed by Android Git Automerger Jul 28, 2010

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

parents 3f936db4 b9df3100

libs/utils/StreamingZipInflater.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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; }