am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."

* commit '8c86e4e2c075c7a879a9f73b56ab075dde61176a':
  Remove a HAVE_MS_C_RUNTIME I missed.
This commit is contained in:
Elliott Hughes 2015-08-19 01:39:24 +00:00 committed by Android Git Automerger
commit 68f66cf7e7
1 changed files with 1 additions and 1 deletions

View File

@ -58,7 +58,7 @@ enum {
ALREADY_EXISTS = -EEXIST,
DEAD_OBJECT = -EPIPE,
FAILED_TRANSACTION = (UNKNOWN_ERROR + 2),
#if !defined(HAVE_MS_C_RUNTIME)
#if !defined(_WIN32)
BAD_INDEX = -EOVERFLOW,
NOT_ENOUGH_DATA = -ENODATA,
WOULD_BLOCK = -EWOULDBLOCK,