Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."

aosp-mirror · Jul 29, 2015 · 7d71d88 · 7d71d88
2 parents e942b45 + 98c11b5
commit 7d71d88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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