summaryrefslogtreecommitdiff
path: root/include/utils
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-17 21:05:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-17 21:05:52 +0000
commit8528d9cfb4ee36c0ffe30b15729873211240e449 (patch)
tree408bbbb94228c0c7ee1c696553ec851436b2a73b /include/utils
parent6c74e5454456e7652b80fb6d19292a7a8948123c (diff)
parent8025096e2e523d6d03a35b19471793f85e03ec1a (diff)
am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."
* commit '8025096e2e523d6d03a35b19471793f85e03ec1a': Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/Errors.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/utils/Errors.h b/include/utils/Errors.h
index 9402614f6..06565eab5 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;