diff options
author | Elliott Hughes <enh@google.com> | 2015-08-17 21:15:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-17 21:15:40 +0000 |
commit | 84d4917c7560da364eb8fe79353e046807beb416 (patch) | |
tree | 209739704a79f211773a4ed6f08f78724cbe6bcc /tools/aapt/XMLNode.cpp | |
parent | cd3f875321a30f9cc21e631fa85f7fb12901b147 (diff) | |
parent | 12cf0f9c4cf8e6aed738da7349f556bd716ec09e (diff) |
am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e':
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
Diffstat (limited to 'tools/aapt/XMLNode.cpp')
-rw-r--r-- | tools/aapt/XMLNode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index ca3f68748ef9..dc08eb806356 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/XMLNode.cpp @@ -12,7 +12,7 @@ #include <errno.h> #include <string.h> -#ifndef HAVE_MS_C_RUNTIME +#ifndef _WIN32 #define O_BINARY 0 #endif |