diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-01-10 18:16:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-01-10 18:16:07 +0100 |
| commit | 78cf3f0de90613cc8621f806444120ee3b12b507 (patch) | |
| tree | a2f148aec8d721ccaf9808614642020e58421ae7 | |
| parent | a02471e2952b16c14a0ee779ba69ff4272c10192 (diff) | |
| download | vim-git-78cf3f0de90613cc8621f806444120ee3b12b507.tar.gz | |
updated for version 7.4.141v7.4.141
Problem: Problems when building with Borland: st_mode is signed short;
can't build with Python; temp files not ignored by Mercurial;
building with DEBUG doesn't define _DEBUG.
Solution: Fix the problems. (Ken Takata)
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | src/Make_bc5.mak | 2 | ||||
| -rw-r--r-- | src/if_py_both.h | 5 | ||||
| -rw-r--r-- | src/os_win32.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 18 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index eff38a83e..9fbd77957 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,15 @@ src/Obj*/pathdef.c gvimext.dll gvimext.lib +# Borland C++ +bcc.cfg +*.ilc +*.ild +*.ilf +*.ils +*.map +*.tds + # Mac OSX src/xxd/xxd.dSYM diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak index 8172c1f4c..5769bd64b 100644 --- a/src/Make_bc5.mak +++ b/src/Make_bc5.mak @@ -419,7 +419,7 @@ CPUARG = -$(CPUNR) ALIGNARG = -a$(ALIGN) # !if ("$(DEBUG)"=="yes") -DEFINES=$(DEFINES) -DDEBUG +DEFINES=$(DEFINES) -DDEBUG -D_DEBUG !endif # !if ("$(OLE)"=="yes") diff --git a/src/if_py_both.h b/src/if_py_both.h index 5a49d1e9e..17c02a9ec 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -13,6 +13,11 @@ * Common code for if_python.c and if_python3.c. */ +#ifdef __BORLANDC__ +/* Disable Warning W8060: Possibly incorrect assignment in function ... */ +# pragma warn -8060 +#endif + static char_u e_py_systemexit[] = "E880: Can't handle SystemExit of %s exception in vim"; #if PY_VERSION_HEX < 0x02050000 diff --git a/src/os_win32.c b/src/os_win32.c index fff3f8476..4feb69791 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -2960,7 +2960,7 @@ mch_getperm(char_u *name) int n; n = mch_stat(name, &st); - return n == 0 ? (long)st.st_mode : -1L; + return n == 0 ? (long)(unsigned short)st.st_mode : -1L; } diff --git a/src/version.c b/src/version.c index 55b52de6a..1fd98ead2 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 141, +/**/ 140, /**/ 139, |