diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-01-20 21:41:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-01-20 21:41:47 +0100 |
| commit | 8d8ef0b0b9c95e117d988fbf9e3bdaa8fef60cc4 (patch) | |
| tree | 26f7c20e1ce541108ad608442495acc53e310761 | |
| parent | fc307fa1a6d2a4c33cd16e09561f601c801565a9 (diff) | |
| download | vim-git-7.2.344.tar.gz | |
updated for version 7.2.344v7.2.344
Problem: Can't compile on some systems
Solution: Move the #ifdef outside of the mch_open macro. (Patrick Texier)
| -rw-r--r-- | src/ex_cmds2.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index bcdf28723..81feac835 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -2814,11 +2814,11 @@ static FILE *fopen_noinh_readbin __ARGS((char *filename)); fopen_noinh_readbin(filename) char *filename; { - int fd_tmp = mch_open(filename, O_RDONLY # ifdef WIN32 - | O_BINARY | O_NOINHERIT + int fd_tmp = mch_open(filename, O_RDONLY | O_BINARY | O_NOINHERIT, 0); +# else + int fd_tmp = mch_open(filename, O_RDONLY, 0); # endif - , 0); if (fd_tmp == -1) return NULL; diff --git a/src/version.c b/src/version.c index 41d099da5..00c77babd 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 344, +/**/ 343, /**/ 342, |