Fix two android compile errors in fs.c #924

Replace usage of deprecated S_IEXEC with S_IXUSR.
Rename a variable named "errno" to avoid clashing with define.
This commit is contained in:
Fredrik Fornwall
2014-07-08 22:42:39 +02:00
committed by Nicolas Hillegeer
parent ef70d7ccf7
commit 308953ecbf

View File

@@ -41,9 +41,9 @@ int os_dirname(char_u *buf, size_t len)
{ {
assert(buf && len); assert(buf && len);
int errno; int error_number;
if ((errno = uv_cwd((char *)buf, &len)) != kLibuvSuccess) { if ((error_number = uv_cwd((char *)buf, &len)) != kLibuvSuccess) {
STRLCPY(buf, uv_strerror(errno), len); STRLCPY(buf, uv_strerror(error_number), len);
return FAIL; return FAIL;
} }
return OK; return OK;
@@ -96,7 +96,7 @@ static bool is_executable(const char_u *name)
return false; return false;
} }
if (S_ISREG(mode) && (S_IEXEC & mode)) { if (S_ISREG(mode) && (S_IXUSR & mode)) {
return true; return true;
} }