diff options
| author | Jonas Dourado <jonas.jonaias@gmail.com> | 2015-02-18 01:11:54 -0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-03-17 23:52:50 -0400 |
| commit | 293a7dc134eb69839fa67381afbdeacb29f96219 (patch) | |
| tree | 5a4bb58aa64b66d36e6872b842b9d1593e41eb46 | |
| parent | 70393f2e3084e68056f22c2983163745d712ad5c (diff) | |
| download | rneovim-293a7dc134eb69839fa67381afbdeacb29f96219.tar.gz rneovim-293a7dc134eb69839fa67381afbdeacb29f96219.tar.bz2 rneovim-293a7dc134eb69839fa67381afbdeacb29f96219.zip | |
Remove platform dependent HAVE_OPENDIR #2010
| -rw-r--r-- | config/config.h.in | 1 | ||||
| -rw-r--r-- | src/nvim/os_unix_defs.h | 4 | ||||
| -rw-r--r-- | src/nvim/path.c | 7 | ||||
| -rw-r--r-- | src/nvim/vim.h | 7 |
4 files changed, 0 insertions, 19 deletions
diff --git a/config/config.h.in b/config/config.h.in index a3cd72b57c..8f3d154553 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -31,7 +31,6 @@ #cmakedefine HAVE_LSTAT #cmakedefine HAVE_NL_LANGINFO_CODESET #cmakedefine HAVE_NL_MSG_CAT_CNTR -#cmakedefine HAVE_OPENDIR #define HAVE_OSPEED 1 #cmakedefine HAVE_PUTENV #cmakedefine HAVE_PWD_H diff --git a/src/nvim/os_unix_defs.h b/src/nvim/os_unix_defs.h index e5ab9fd4f7..4ffd23aa25 100644 --- a/src/nvim/os_unix_defs.h +++ b/src/nvim/os_unix_defs.h @@ -182,10 +182,6 @@ /* Special wildcards that need to be handled by the shell */ #define SPECIAL_WILDCHAR "`'{" -#ifndef HAVE_OPENDIR -# define NO_EXPANDPATH -#endif - /* * Unix has plenty of memory, use large buffers */ diff --git a/src/nvim/path.c b/src/nvim/path.c index 361a4a57f0..346be9108d 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -401,8 +401,6 @@ char_u *save_absolute_path(const char_u *name) } -#if !defined(NO_EXPANDPATH) - #if defined(UNIX) /* * Unix style wildcard expansion code. @@ -1234,7 +1232,6 @@ addfile ( add_pathsep(p); GA_APPEND(char_u *, gap, p); } -#endif /* !NO_EXPANDPATH */ /* * Converts a file name into a canonical form. It simplifies a file name into @@ -1608,7 +1605,6 @@ int same_directory(char_u *f1, char_u *f2) && pathcmp((char *)ffname, (char *)f2, (int)(t1 - ffname)) == 0; } -#if !defined(NO_EXPANDPATH) /* * Compare path "p[]" to "q[]". * If "maxlen" >= 0 compare "p[maxlen]" to "q[maxlen]" @@ -1673,9 +1669,7 @@ int pathcmp(const char *p, const char *q, int maxlen) return -1; /* no match */ return 1; } -#endif -#ifndef NO_EXPANDPATH /* * Expand a path into all matching files and/or directories. Handles "*", * "?", "[a-z]", "**", etc. @@ -1688,7 +1682,6 @@ int mch_expandpath(garray_T *gap, char_u *path, int flags) { return unix_expandpath(gap, path, 0, flags, FALSE); } -#endif /// Try to find a shortname by comparing the fullname with the current /// directory. diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 8f80efd88a..29d61dcbde 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -184,13 +184,6 @@ enum { }; -#ifdef NO_EXPANDPATH -# define gen_expand_wildcards mch_expand_wildcards -#endif - - - - |