patch 8.0.1357: startup test fails on OpenBSD

Problem:    Startup test fails on OpenBSD. (Edd Barrett)
Solution:   Check for "BSD" instead of "FreeBSD" being defined. (James McCoy,
            closes #2376, closes #2378)

diff --git a/src/version.c b/src/version.c
index 50e3f16000beb939eb9dd1ac9a0fd153a643388b..6fb11e9119e68bd1f66a0a5f159cd4373561a8af 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1357,
 /**/
     1356,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 1c2b7950eb1ba930a29bbeb90170bd8e610ce6b7..bf6c3d3ff4d377885a3270ea477fd654ca991924 100644 (file)
--- 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