updated for version 7.3.087

Problem:    EINTR is not always defined.
Solution:   Include errno.h in vim.h.

diff --git a/src/if_cscope.c b/src/if_cscope.c
index bc8ea946389cb14ebd0c1fd20db574b65d5e34d2..8867f63852c055baa66adac8679b7e4231c2d77c 100644 (file)
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -13,8 +13,6 @@
 
 #if defined(FEAT_CSCOPE) || defined(PROTO)
 
-#include <string.h>
-#include <errno.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/if_tcl.c b/src/if_tcl.c
index f87407d4f92702fa5ee431a8416b1a92cd535c81..e5eee2926e3fba6e45fd71aa0829ddeb464f459d 100644 (file)
--- a/src/if_tcl.c
+++ b/src/if_tcl.c
@@ -74,7 +74,6 @@ TODO:
 #endif
 
 #include <tcl.h>
-#include <errno.h>
 #include <string.h>
 
 typedef struct

diff --git a/src/integration.c b/src/integration.c
index 8de684c073e0adaae78d5fe542cfea0eda78f463..3f38c55e5b73dbf9e75fc81b113565278552c40e 100644 (file)
--- a/src/integration.c
+++ b/src/integration.c
@@ -33,7 +33,6 @@
 #include <sys/un.h>
 #endif
 
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>

diff --git a/src/memline.c b/src/memline.c
index d978b9020bfbc1e23d479c95fc45bbc25d9ef93e..0beaf54722c85523d17951643cbab90c199b6491 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -52,10 +52,6 @@
 # include <proto/dos.h>            /* for Open() and Close() */
 #endif
 
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
 typedef struct block0          ZERO_BL;    /* contents of the first block */
 typedef struct pointer_block   PTR_BL;     /* contents of a pointer block */
 typedef struct data_block      DATA_BL;    /* contents of a data block */

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 7dcc053696ebfb72b36483dfec65c09b533decda..0b9dfd91e53a7cb33ef93f9bd65f15d7d1eb039f 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -30,7 +30,6 @@
 # include <string.h>
 #endif
 #include <sys/types.h>
-#include <errno.h>
 #include <signal.h>
 #include <limits.h>
 #include <process.h>

diff --git a/src/os_win16.c b/src/os_win16.c
index 66ca198ed294fc37272541aaa82f21ed58b2abc0..c4d9cfc88a51bcbefd2c330f3c7ec68670d79ff5 100644 (file)
--- a/src/os_win16.c
+++ b/src/os_win16.c
@@ -25,7 +25,6 @@
 #include <dos.h>
 #include <string.h>
 #include <sys/types.h>
-#include <errno.h>
 #include <signal.h>
 #include <limits.h>
 #include <process.h>

diff --git a/src/os_win32.c b/src/os_win32.c
index dcf95ee2748a68f7ba2ae7bdd8033d9f2be8a95f..30b725d4cfb43c3914b81e58f7a941c42403f08c 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <sys/types.h>
-#include <errno.h>
 #include <signal.h>
 #include <limits.h>
 #include <process.h>

diff --git a/src/version.c b/src/version.c
index d3ad470920392b42e9b159971ac4115b3976a5e4..8c51226030cdec7c052535d4b45eba78afcf82ba 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    87,
 /**/
     86,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 5eea08504da286deb9d470320718f60e03478ffa..15595bf0381c500991ec38ec4650979c2d3bb017 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -480,6 +480,11 @@ typedef unsigned long u8char_T;        /* long should be 32 bits or more */
 # include <sys/stat.h>
 #endif
 
+#if defined(HAVE_ERRNO_H) || defined(DJGPP) || defined(WIN16) \
+       || defined(WIN32) || defined(_WIN64) || defined(__EMX__)
+# include <errno.h>
+#endif
+
 /*
  * Allow other (non-unix) systems to configure themselves now
  * These are also in os_unix.h, because osdef.sh needs them there.

diff --git a/src/workshop.c b/src/workshop.c
index 89f55efc7a236fd4cce9d39f5a6700ce485fef6c..e0db10ec7818dad83574e7f06bb98351d13b6715 100644 (file)
--- a/src/workshop.c
+++ b/src/workshop.c
@@ -16,7 +16,6 @@
 #include <sys/types.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <errno.h>
 #include <sys/socket.h>
 #ifdef HAVE_LIBGEN_H
 # include <libgen.h>