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

Commit b9df3100 authored by Chris Tate's avatar Chris Tate Committed by Android Git Automerger
Browse files

am 7b40518e: Merge "Change unistd.h to stddef.h to be correct" into gingerbread

Merge commit '7b40518e56a3238b28b24a786a2ff22d5a425765' into gingerbread-plus-aosp

* commit '7b40518e56a3238b28b24a786a2ff22d5a425765':
  Change unistd.h to stddef.h to be correct
parents a99e500a 7fd86dea
Loading
Loading
Loading
Loading
+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; }