From 33321f2c856f04d2a928c89fed1b6d46012b0bc9 Mon Sep 17 00:00:00 2001
From: Seth Jackson <sethjackson@gmail.com>
Date: Sun, 17 Jan 2016 09:47:26 -0500
Subject: 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.
---
 src/nvim/log.c          | 4 ----
 src/nvim/os/unix_defs.h | 2 +-
 src/nvim/shada.c        | 3 ---
 3 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

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