Mercurial > vim
changeset 5588:2ca470c6096e v7.4.141
updated for version 7.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)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Fri, 10 Jan 2014 18:16:07 +0100 |
parents | 3fd0adcb6941 |
children | 6939a6ea594c |
files | .hgignore src/Make_bc5.mak src/if_py_both.h src/os_win32.c src/version.c |
diffstat | 5 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore +++ b/.hgignore @@ -38,6 +38,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
--- 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")
--- 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