From 308953ecbf22dd967f8c6647852835286d8548e8 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 8 Jul 2014 22:42:39 +0200
Subject: 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.
---
 src/nvim/os/fs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

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;
   }
 
-- 
cgit