Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."

Browse Source 
* commit '7d71d88c6d305d6ed19b320944f4ce644db82240':
  Use _WIN32 rather than HAVE_WINDOWS_PATHS.
This commit is contained in:
Elliott Hughes
2015-07-29 16:17:14 +00:00
committed by Android Git Automerger
parent 73612fbbc9 7d71d88c6d
commit a7e6be686d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aidl/aidl.cpp
View File

@@ -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