summaryrefslogtreecommitdiff
path: root/tools/aidl/aidl.cpp
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2015-07-29 17:12:08 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-29 17:12:08 +0000
commit114fb59f94aca616bdb35be2ee63ada74eb87e31 (patch)
tree8a7ae4ba2d2d0c179ed539975582618795817fa3 /tools/aidl/aidl.cpp
parent5bdaeeafe66bf96aa92ef13e73f35ff7c7be701e (diff)
parentbda2b34bfa796ffe86bf3f3b2bc3646e9b49d612 (diff)
am bda2b34b: am a7e6be68: am 7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."
* commit 'bda2b34bfa796ffe86bf3f3b2bc3646e9b49d612': Use _WIN32 rather than HAVE_WINDOWS_PATHS.
Diffstat (limited to 'tools/aidl/aidl.cpp')
-rw-r--r--tools/aidl/aidl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp
index e31b03c07e9a..ff08b67fe234 100644
--- a/tools/aidl/aidl.cpp
+++ b/tools/aidl/aidl.cpp
@@ -177,7 +177,7 @@ check_filename(const char* filename, const char* package, buffer_type* name)
char cwd[MAXPATHLEN];
bool valid = false;
-#ifdef HAVE_WINDOWS_PATHS
+#ifdef _WIN32
if (isalpha(filename[0]) && filename[1] == ':'
&& filename[2] == OS_PATH_SEPARATOR) {
#else
@@ -217,7 +217,7 @@ check_filename(const char* filename, const char* package, buffer_type* name)
if (valid) {
p = fn.c_str() + (len - expected.length());
-#ifdef HAVE_WINDOWS_PATHS
+#ifdef _WIN32
if (OS_PATH_SEPARATOR != '/') {
// Input filename under cygwin most likely has / separators
// whereas the expected string uses \\ separators. Adjust