am f3743584: Merge "Fix signed/unsigned comparison that was upsetting clang."

* commit 'f374358414812d3e5a45ba75a2b1926693924420':
  Fix signed/unsigned comparison that was upsetting clang.
This commit is contained in:
Elliott Hughes 2015-01-21 02:11:35 +00:00 committed by Android Git Automerger
commit 45bdcf895b

View File

@ -83,7 +83,7 @@ fread(void *buf, size_t size, size_t count, FILE *fp)
/*
* Copy data out of the buffer.
*/
size_t buffered_bytes = MIN(fp->_r, total);
size_t buffered_bytes = MIN((size_t) fp->_r, total);
memcpy(dst, fp->_p, buffered_bytes);
fp->_p += buffered_bytes;
fp->_r -= buffered_bytes;