diff options
| author | 2015-07-29 16:46:20 +0000 | |
|---|---|---|
| committer | 2015-07-29 16:46:20 +0000 | |
| commit | bda2b34bfa796ffe86bf3f3b2bc3646e9b49d612 (patch) | |
| tree | 91269e3fb717fe7f353c6708ccfc812469588801 | |
| parent | 49b22e94732bd9c46a7eaa29be3929b7d8b4b77a (diff) | |
| parent | a7e6be686d38e80cbb385f643eb5c790a7094f34 (diff) | |
am a7e6be68: am 7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."
* commit 'a7e6be686d38e80cbb385f643eb5c790a7094f34':
Use _WIN32 rather than HAVE_WINDOWS_PATHS.
| -rw-r--r-- | tools/aidl/aidl.cpp | 4 |
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 |