diff options
| author | Fredrik Fornwall <fredrik@fornwall.net> | 2014-07-08 22:42:39 +0200 |
|---|---|---|
| committer | Nicolas Hillegeer <nicolas@hillegeer.com> | 2014-07-09 09:17:38 +0200 |
| commit | 308953ecbf22dd967f8c6647852835286d8548e8 (patch) | |
| tree | c61d4e7989ca4d308f8150de96c4e9ea1d85a7cb /src | |
| parent | ef70d7ccf71c5d0b00f02be9a9aee879f26e8355 (diff) | |
| download | rneovim-308953ecbf22dd967f8c6647852835286d8548e8.tar.gz rneovim-308953ecbf22dd967f8c6647852835286d8548e8.tar.bz2 rneovim-308953ecbf22dd967f8c6647852835286d8548e8.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/os/fs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 5ccefd8ac5..c1cb418d5c 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -41,9 +41,9 @@ int os_dirname(char_u *buf, size_t len) { assert(buf && len); - int errno; - if ((errno = uv_cwd((char *)buf, &len)) != kLibuvSuccess) { - STRLCPY(buf, uv_strerror(errno), len); + int error_number; + if ((error_number = uv_cwd((char *)buf, &len)) != kLibuvSuccess) { + STRLCPY(buf, uv_strerror(error_number), len); return FAIL; } return OK; @@ -96,7 +96,7 @@ static bool is_executable(const char_u *name) return false; } - if (S_ISREG(mode) && (S_IEXEC & mode)) { + if (S_ISREG(mode) && (S_IXUSR & mode)) { return true; } |