aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKunMing Xie <qqzz014@gmail.com>2017-07-23 01:04:45 +0800
committerJustin M. Keyes <justinkz@gmail.com>2017-07-22 19:04:45 +0200
commit253f6f3bbfd16b7aeb2f72714c1d5d1c88a3478a (patch)
tree1527bfa5f8338ba6b669c3e5597c8028214c0bcd /src
parent8fb599029f41b74e6c34b680a0817ff19f544cf3 (diff)
downloadrneovim-253f6f3bbfd16b7aeb2f72714c1d5d1c88a3478a.tar.gz
rneovim-253f6f3bbfd16b7aeb2f72714c1d5d1c88a3478a.tar.bz2
rneovim-253f6f3bbfd16b7aeb2f72714c1d5d1c88a3478a.zip
vim-patch:8.0.0038 (#7051)
Problem: OPEN_CHR_FILES not defined for FreeBSD using Debian userland files. Solution: Check for __FreeBSD_kernel__. (James McCoy, closes vim/vim#1166) https://github.com/vim/vim/commit/ca291aec99b60fe81eaab36aa718e51421bb88d5
Diffstat (limited to 'src')
-rw-r--r--src/nvim/version.c2
-rw-r--r--src/nvim/vim.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 61d947017e..d372779c75 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -691,7 +691,7 @@ static const int included_patches[] = {
41,
40,
// 39 NA
- // 38,
+ 38,
37,
// 36 NA
35,
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 5d2c27a2f4..c71ca411ea 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -319,7 +319,7 @@ enum { FOLD_TEXT_LEN = 51 }; //!< buffer size for get_foldtext()
// Lowest number used for window ID. Cannot have this many windows per tab.
#define LOWEST_WIN_ID 1000
-#if defined(__FreeBSD__) && defined(S_ISCHR)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(S_ISCHR)
# define OPEN_CHR_FILES
#endif