aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Abreu Ferreira <raf-ep@gmx.com>2015-04-10 11:31:08 +0100
committerMichael Reed <m.reed@mykolab.com>2015-05-21 02:09:50 -0400
commitac42fb8ca729ecac3bc3c43d4f68ce79ca3a5faa (patch)
treee7046738a8a169128701f7cee84e7a7b01ddff77
parente1f83d304dc787374ae152bb308599dd024ae2bb (diff)
downloadrneovim-ac42fb8ca729ecac3bc3c43d4f68ce79ca3a5faa.tar.gz
rneovim-ac42fb8ca729ecac3bc3c43d4f68ce79ca3a5faa.tar.bz2
rneovim-ac42fb8ca729ecac3bc3c43d4f68ce79ca3a5faa.zip
Add guard for sys/wait.h header in job.c #2686
The sys/wait.h include was moved after the vim.h include, since the include guards are defined in config.h the guards cannot be used earlier.
-rw-r--r--src/nvim/os/job.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/os/job.c b/src/nvim/os/job.c
index 8fe44c7a53..038d0e3c26 100644
--- a/src/nvim/os/job.c
+++ b/src/nvim/os/job.c
@@ -1,8 +1,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <sys/wait.h>
-
#include <uv.h>
#include "nvim/os/uv_helpers.h"
@@ -20,6 +18,10 @@
#include "nvim/vim.h"
#include "nvim/memory.h"
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+
// {SIGNAL}_TIMEOUT is the time (in nanoseconds) that a job has to cleanly exit
// before we send SIGNAL to it
#define TERM_TIMEOUT 1000000000