commit 5eb13177ce17df9240794cfc23d5b96d018db8bc
author Elliott Hughes <enh@google.com> Wed Aug 19 01:39:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 19 01:39:24 2015 +0000
tree fffc38b2eb543ce786d2f93f03499078c71a6557
parent e48a9bf5c7894e8a92022204df008e8ff33bbaa8
parent 6f39d2b831f901e08096d5b8d87feee537033e75

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

* commit '8c86e4e2c075c7a879a9f73b56ab075dde61176a':
  Remove a HAVE_MS_C_RUNTIME I missed.

include/utils/Errors.h

diff --git a/include/utils/Errors.h b/include/utils/Errors.h
index 06565ea..08ddcd2 100644
--- a/include/utils/Errors.h
+++ b/include/utils/Errors.h
@@ -58,7 +58,7 @@
     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,