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/aidl.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/aidl.cpp')
| -rw-r--r-- | tools/aidl/aidl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index 368e73d05f18..438007f527d5 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -15,7 +15,7 @@ #include <string.h> #include <map> -#ifdef HAVE_MS_C_RUNTIME +#ifdef _WIN32 #include <io.h> #include <direct.h> #include <sys/stat.h> @@ -754,7 +754,7 @@ check_outputFilePath(const string& path) { if (path[i] == OS_PATH_SEPARATOR) { string p = path.substr(0, i); if (access(path.data(), F_OK) != 0) { -#ifdef HAVE_MS_C_RUNTIME +#ifdef _WIN32 _mkdir(p.data()); #else mkdir(p.data(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP); @@ -1113,7 +1113,7 @@ preprocess_aidl(const Options& options) // write preprocessed file int fd = open( options.outputFileName.c_str(), O_RDWR|O_CREAT|O_TRUNC|O_BINARY, -#ifdef HAVE_MS_C_RUNTIME +#ifdef _WIN32 _S_IREAD|_S_IWRITE); #else S_IRUSR|S_IWUSR|S_IRGRP); |