commit 08381c3f80dedf9ed75abf5c78575c5893304d03
author Elliott Hughes <enh@google.com> Mon Aug 17 20:57:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 17 20:57:49 2015 +0000
tree 8ed40b118b6939f51b37c56fa4420cf727a9bb39
parent bedf3ab3cb70bece518b29e83bc1d3e85bbad455
parent 0c6b8f20030443e4bdde4595164a4bb01cedceb1

am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."

* commit '28595721b19791cf4c857f048acdaeae632d329e':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.

include/utils/Errors.h

diff --git a/include/utils/Errors.h b/include/utils/Errors.h
index 9402614..06565ea 100644
--- a/include/utils/Errors.h
+++ b/include/utils/Errors.h
@@ -23,7 +23,7 @@
 namespace android {
 
 // use this type to return error codes
-#ifdef HAVE_MS_C_RUNTIME
+#ifdef _WIN32
 typedef int         status_t;
 #else
 typedef int32_t     status_t;