diff options
| author | Seth Jackson <sethjackson@gmail.com> | 2016-01-17 09:47:26 -0500 |
|---|---|---|
| committer | Seth Jackson <sethjackson@gmail.com> | 2016-01-18 13:48:47 -0500 |
| commit | 33321f2c856f04d2a928c89fed1b6d46012b0bc9 (patch) | |
| tree | ca533fa9b10e2c7cdb9d6666f96e8d66028e9702 | |
| parent | ee0e214427d7ed2a9fd8ffc85c424cfffc927408 (diff) | |
| download | rneovim-33321f2c856f04d2a928c89fed1b6d46012b0bc9.tar.gz rneovim-33321f2c856f04d2a928c89fed1b6d46012b0bc9.tar.bz2 rneovim-33321f2c856f04d2a928c89fed1b6d46012b0bc9.zip | |
config: Remove HAVE_UNISTD_H.
Unix systems must have this header but Windows does not have it at all.
Since src/nvim/os/unix_defs.h includes <unistd.h> without the guard
in order to avoid including this in the numerous places we would
need <unistd.h> on Unix we just include src/nvim/os/os.h which will pull
in <unistd.h> for us.
| -rw-r--r-- | config/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | config/config.h.in | 1 | ||||
| -rw-r--r-- | src/nvim/log.c | 4 | ||||
| -rw-r--r-- | src/nvim/os/unix_defs.h | 2 | ||||
| -rw-r--r-- | src/nvim/shada.c | 3 |
5 files changed, 1 insertions, 10 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 2d3c484845..eaf06ba7f2 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -26,7 +26,6 @@ if(NOT HAVE_SYS_WAIT_H AND UNIX) message(SEND_ERROR "header sys/wait.h is required for Unix") endif() check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H) -check_include_files(unistd.h HAVE_UNISTD_H) check_include_files(utime.h HAVE_UTIME_H) # Functions diff --git a/config/config.h.in b/config/config.h.in index 1eafc8cb95..27705f8b38 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -39,7 +39,6 @@ #cmakedefine HAVE_STRNCASECMP #cmakedefine HAVE_SYS_UTSNAME_H #cmakedefine HAVE_SYS_WAIT_H -#cmakedefine HAVE_UNISTD_H #cmakedefine HAVE_UTIME #cmakedefine HAVE_UTIME_H #cmakedefine HAVE_UTIMES diff --git a/src/nvim/log.c b/src/nvim/log.c index 5767da03af..773d497881 100644 --- a/src/nvim/log.c +++ b/src/nvim/log.c @@ -10,10 +10,6 @@ #include "nvim/os/os.h" #include "nvim/os/time.h" -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - #define USR_LOG_FILE "$HOME" _PATHSEPSTR ".nvimlog" static uv_mutex_t mutex; diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h index 78fc9331d1..690a39c3cd 100644 --- a/src/nvim/os/unix_defs.h +++ b/src/nvim/os/unix_defs.h @@ -2,7 +2,7 @@ #define NVIM_OS_UNIX_DEFS_H // Windows doesn't have unistd.h, so we include it here to avoid numerous -// instances of `#ifdef HAVE_UNISTD_H'. +// instances of `#ifdef WIN32'. #include <unistd.h> // POSIX.1-2008 says that NAME_MAX should be in here diff --git a/src/nvim/shada.c b/src/nvim/shada.c index dcdf2195f8..def2de9b1a 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -6,9 +6,6 @@ #include <inttypes.h> #include <errno.h> #include <fcntl.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include <assert.h> #include <msgpack.h> |