summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-21 21:57:06 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-21 21:57:06 +0100
commitbfd30590f6e3475033099d0fb20d9444fa10af6b (patch)
tree3d8c580a74556eb8133e5dbfdae7573882800c90
parent3a257737726ba42980bf38ec9a0c80944756af24 (diff)
downloadvim-git-bfd30590f6e3475033099d0fb20d9444fa10af6b.tar.gz
patch 8.0.0346: Vim relies on limits.h to be included indirectlyv8.0.0346
Problem: Vim relies on limits.h to be included indirectly, but on Solaris 9 it may not be. (Ben Fritz) Solution: Always include limits.h.
-rw-r--r--src/os_unixx.h11
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h3
3 files changed, 6 insertions, 10 deletions
diff --git a/src/os_unixx.h b/src/os_unixx.h
index c83ea31e4..edf7914aa 100644
--- a/src/os_unixx.h
+++ b/src/os_unixx.h
@@ -69,16 +69,7 @@
#endif
#ifdef HAVE_SYS_SYSTEMINFO_H
-/*
- * foolish Sinix <sys/systeminfo.h> uses SYS_NMLN but doesn't include
- * <limits.h>, where it is defined. Perhaps other systems have the same
- * problem? Include it here. -- Slootman
- */
-# if defined(HAVE_LIMITS_H) && !defined(_LIMITS_H)
-# include <limits.h> /* for SYS_NMLN (Sinix 5.41 / Unix SysV.4) */
-# endif
-
-/* Define SYS_NMLN ourselves if it still isn't defined (for CrayT3E). */
+/* <sys/systeminfo.h> uses SYS_NMLN but it may not be defined (CrayT3E). */
# ifndef SYS_NMLN
# define SYS_NMLN 32
# endif
diff --git a/src/version.c b/src/version.c
index 2b08df52e..1d23935fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 346,
+/**/
345,
/**/
344,
diff --git a/src/vim.h b/src/vim.h
index 8636c56d0..b1faf234d 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -487,6 +487,9 @@ typedef unsigned long u8char_T; /* long should be 32 bits or more */
# include <errno.h>
#endif
+/* for INT_MAX et al. */
+#include <limits.h>
+
/*
* Allow other (non-unix) systems to configure themselves now
* These are also in os_unix.h, because osdef.sh needs them there.