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/aidl/search_path.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/aidl/search_path.cpp')
| -rw-r--r-- | tools/aidl/search_path.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aidl/search_path.cpp b/tools/aidl/search_path.cpp index 29dbe260c4f1..029e216b0abd 100644 --- a/tools/aidl/search_path.cpp +++ b/tools/aidl/search_path.cpp @@ -4,7 +4,7 @@ #include "os.h" #include <string.h> -#ifdef HAVE_MS_C_RUNTIME +#ifdef _WIN32 #include <io.h> #endif @@ -42,7 +42,7 @@ find_import_file(const char* given) } f.append(expected); -#ifdef HAVE_MS_C_RUNTIME +#ifdef _WIN32 /* check that the file exists and is not write-only */ if (0 == _access(f.c_str(), 0) && /* mode 0=exist */ 0 == _access(f.c_str(), 4) ) { /* mode 4=readable */ |