summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-28 21:06:18 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-28 21:06:18 +0100
commit1a2ab991a6d168699fbcc934b63cfc3579c3d34d (patch)
tree33939149aac713e47eb5da9d9d731998d6fe1fda
parentc5aa55db7e5bc791f99fb15b0f4be0d5dd166f62 (diff)
patch 8.0.1357: startup test fails on OpenBSDv8.0.1357
Problem: Startup test fails on OpenBSD. (Edd Barrett) Solution: Check for "BSD" instead of "FreeBSD" being defined. (James McCoy, closes #2376, closes #2378)
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 50e3f16000..6fb11e9119 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1357,
+/**/
1356,
/**/
1355,
diff --git a/src/vim.h b/src/vim.h
index 1c2b7950eb..bf6c3d3ff4 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2485,7 +2485,8 @@ typedef enum {
#define FNE_INCL_BR 1 /* include [] in name */
#define FNE_CHECK_START 2 /* check name starts with valid character */
-#if (defined(SUN_SYSTEM) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
+/* BSD is supposed to cover FreeBSD and similar systems. */
+#if (defined(SUN_SYSTEM) || defined(BSD) || defined(__FreeBSD_kernel__)) \
&& defined(S_ISCHR)
# define OPEN_CHR_FILES
#endif