mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-21 10:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove mch_access macro as it is only used in fs.c

Browse Source
This commit is contained in:
Stefan Hoffmann
2014-03-16 17:45:25 +01:00
committed by Thiago de Arruda
parent f762a9e195
commit 5a2c9e123e
4 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/macros.h
View File

@@ -120,7 +120,6 @@
* On VMS file names are different and require a translation. * On VMS file names are different and require a translation.
* On the Mac open() has only two arguments. * On the Mac open() has only two arguments.
*/ */
# define mch_access(n, p) access((n), (p))
# define mch_fopen(n, p) fopen((n), (p)) # define mch_fopen(n, p) fopen((n), (p))
# define mch_fstat(n, p) fstat((n), (p)) # define mch_fstat(n, p) fstat((n), (p))
# ifdef STAT_IGNORES_SLASH # ifdef STAT_IGNORES_SLASH

4
src/os/fs.c
View File

@@ -281,7 +281,7 @@ int os_file_exists(const char_u *name)
// return TRUE if a file appears to be read-only from the file permissions. // return TRUE if a file appears to be read-only from the file permissions.
int os_file_is_readonly(const char *name) int os_file_is_readonly(const char *name)
{ {
if (mch_access(name, W_OK) == 0) { if (access(name, W_OK) == 0) {
return FALSE; return FALSE;
} else { } else {
return TRUE; return TRUE;
@@ -292,7 +292,7 @@ int os_file_is_readonly(const char *name)
// rights to write into. // rights to write into.
int os_file_is_writable(const char *name) int os_file_is_writable(const char *name)
{ {
if (mch_access(name, W_OK) == 0) { if (access(name, W_OK) == 0) {
if (os_isdir((char_u *)name)) { if (os_isdir((char_u *)name)) {
return 2; return 2;
} }

6
src/os_unix_defs.h
View File

@@ -18,12 +18,6 @@
# include <stdlib.h> # include <stdlib.h>
/* On AIX 4.2 there is a conflicting prototype for ioctl() in stropts.h and
* unistd.h. This hack should fix that (suggested by Jeff George).
* But on AIX 4.3 it's alright (suggested by Jake Hamby). */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif

7
src/vim.h
View File

@@ -1016,13 +1016,6 @@ typedef enum {
# define O_NOFOLLOW 0 # define O_NOFOLLOW 0
#endif #endif
#ifndef W_OK
# define W_OK 2 /* for systems that don't have W_OK in unistd.h */
#endif
#ifndef R_OK
# define R_OK 4 /* for systems that don't have R_OK in unistd.h */
#endif
/* /*
* defines to avoid typecasts from (char_u *) to (char *) and back * defines to avoid typecasts from (char_u *) to (char *) and back
* (vim_strchr() and vim_strrchr() are now in alloc.c) * (vim_strchr() and vim_strrchr() are now in alloc.c)