Mercurial > vim
changeset 5112:f063be86b632 v7.3.1299
updated for version 7.3.1299
Problem: Errors when doing "make proto". Didn't do "make depend" for a
while.
Solution: Add #ifdefs. Update dependencies. Update proto files.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 03 Jul 2013 18:49:17 +0200 |
| parents | a539e15ad57c |
| children | 54a5e85247dc |
| files | src/Makefile src/if_python3.c src/os_win32.c src/proto/ex_docmd.pro src/proto/gui_w16.pro src/proto/gui_w32.pro src/proto/if_python.pro src/proto/if_python3.pro src/proto/os_win32.pro src/version.c |
| diffstat | 10 files changed, 34 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -373,6 +373,11 @@ CClink = $(CC) #CONF_OPT_DARWIN = --with-mac-arch=ppc #CONF_OPT_DARWIN = --with-mac-arch=both +# Uncomment the next line to fail if one of the requested language interfaces +# cannot be configured. Without this Vim will be build anyway, without +# the failing interfaces. +#CONF_OPT_FAIL = --enable-fail-if-missing + # LUA # Uncomment one of these when you want to include the Lua interface. # First one is for static linking, second one for dynamic loading. @@ -389,11 +394,6 @@ CClink = $(CC) #CONF_OPT_PLTHOME = --with-plthome=/usr/local/drscheme #CONF_OPT_PLTHOME = --with-plthome=/home/me/mz -# Uncomment the next line to fail if one of the requested language interfaces -# cannot be configured. Without this Vim will be build anyway, without -# the failing interfaces. -#CONF_OPT_FAIL = --enable-fail-if-missing - # PERL # Uncomment one of these when you want to include the Perl interface. # First one is for static linking, second one for dynamic loading. @@ -410,6 +410,7 @@ CClink = $(CC) # PYTHON # Uncomment this when you want to include the Python interface. +# Requires small features or better, fails with tiny features. # NOTE: This may cause threading to be enabled, which has side effects (such # as using different libraries and debugging becomes more difficult). # NOTE: Using this together with Perl may cause a crash in initialization. @@ -2943,7 +2944,7 @@ objects/option.o: option.c vim.h auto/co objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h os_unixx.h + arabic.h if_mzsch.h os_unixx.h objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ @@ -2956,10 +2957,10 @@ objects/quickfix.o: quickfix.c vim.h aut auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ globals.h farsi.h arabic.h -objects/regexp.o: regexp.c regexp_nfa.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ - regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h +objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ + arabic.h regexp_nfa.c objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ @@ -2998,10 +2999,6 @@ objects/version.o: version.c vim.h auto/ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ arabic.h version.h -objects/winclip.o: winclip.c vimio.h vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ - regexp.h gui.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ - proto/winclip.pro objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ @@ -3101,7 +3098,7 @@ objects/if_lua.o: if_lua.c vim.h auto/co objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h if_mzsch.h + globals.h farsi.h arabic.h if_mzsch.h mzscheme_base.c objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
--- a/src/if_python3.c +++ b/src/if_python3.c @@ -83,10 +83,14 @@ #define PY_USE_CAPSULE #define PyInt Py_ssize_t -#define PyString_Check(obj) PyUnicode_Check(obj) +#ifndef PyString_Check +# define PyString_Check(obj) PyUnicode_Check(obj) +#endif #define PyString_FromString(repr) PyUnicode_FromString(repr) #define PyString_FromFormat PyUnicode_FromFormat -#define PyInt_Check(obj) PyLong_Check(obj) +#ifndef PyInt_Check +# define PyInt_Check(obj) PyLong_Check(obj) +#endif #define PyInt_FromLong(i) PyLong_FromLong(i) #define PyInt_AsLong(obj) PyLong_AsLong(obj) #define Py_ssize_t_fmt "n" @@ -156,7 +160,9 @@ # define PyDict_GetItemString py3_PyDict_GetItemString # define PyDict_Next py3_PyDict_Next # define PyMapping_Check py3_PyMapping_Check -# define PyMapping_Keys py3_PyMapping_Keys +# ifndef PyMapping_Keys +# define PyMapping_Keys py3_PyMapping_Keys +# endif # define PyIter_Next py3_PyIter_Next # define PyObject_GetIter py3_PyObject_GetIter # define PyObject_Repr py3_PyObject_Repr @@ -202,7 +208,9 @@ # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString # undef PyBytes_AsString # define PyBytes_AsString py3_PyBytes_AsString -# define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize +# ifndef PyBytes_AsStringAndSize +# define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize +# endif # undef PyBytes_FromString # define PyBytes_FromString py3_PyBytes_FromString # define PyFloat_FromDouble py3_PyFloat_FromDouble
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -142,6 +142,9 @@ typedef int WORD; typedef int WCHAR; typedef void VOID; typedef int BY_HANDLE_FILE_INFORMATION; +typedef int SE_OBJECT_TYPE; +typedef int PSNSECINFO; +typedef int PSNSECINFOW; #endif #ifndef FEAT_GUI_W32
--- a/src/proto/ex_docmd.pro +++ b/src/proto/ex_docmd.pro @@ -40,6 +40,7 @@ void ex_splitview __ARGS((exarg_T *eap)) void tabpage_new __ARGS((void)); void do_exedit __ARGS((exarg_T *eap, win_T *old_curwin)); void free_cd_dir __ARGS((void)); +void post_chdir __ARGS((int local)); void ex_cd __ARGS((exarg_T *eap)); void do_sleep __ARGS((long msec)); int vim_mkdir_emsg __ARGS((char_u *name, int prot)); @@ -53,5 +54,4 @@ int put_eol __ARGS((FILE *fd)); int put_line __ARGS((FILE *fd, char *s)); void dialog_msg __ARGS((char_u *buff, char *format, char_u *fname)); char_u *get_behave_arg __ARGS((expand_T *xp, int idx)); -void post_chdir __ARGS((int local)); /* vim: set ft=c : */
--- a/src/proto/gui_w16.pro +++ b/src/proto/gui_w16.pro @@ -49,8 +49,8 @@ void gui_mch_flash __ARGS((int msec)); void gui_mch_delete_lines __ARGS((int row, int num_lines)); void gui_mch_insert_lines __ARGS((int row, int num_lines)); void gui_mch_exit __ARGS((int rc)); +void gui_mch_wide_font_changed __ARGS((void)); int gui_mch_init_font __ARGS((char_u *font_name, int fontset)); -void gui_mch_wide_font_changed __ARGS((void)); int gui_mch_maximized __ARGS((void)); void gui_mch_newfont __ARGS((void)); void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
--- a/src/proto/gui_w32.pro +++ b/src/proto/gui_w32.pro @@ -49,8 +49,8 @@ void gui_mch_flash __ARGS((int msec)); void gui_mch_delete_lines __ARGS((int row, int num_lines)); void gui_mch_insert_lines __ARGS((int row, int num_lines)); void gui_mch_exit __ARGS((int rc)); +void gui_mch_wide_font_changed __ARGS((void)); int gui_mch_init_font __ARGS((char_u *font_name, int fontset)); -void gui_mch_wide_font_changed __ARGS((void)); int gui_mch_maximized __ARGS((void)); void gui_mch_newfont __ARGS((void)); void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
--- a/src/proto/if_python.pro +++ b/src/proto/if_python.pro @@ -3,8 +3,8 @@ int python_enabled __ARGS((int verbose)) void python_end __ARGS((void)); int python_loaded __ARGS((void)); void ex_python __ARGS((exarg_T *eap)); +void ex_pyfile __ARGS((exarg_T *eap)); void ex_pydo __ARGS((exarg_T *eap)); -void ex_pyfile __ARGS((exarg_T *eap)); void python_buffer_free __ARGS((buf_T *buf)); void python_window_free __ARGS((win_T *win)); void python_tabpage_free __ARGS((tabpage_T *tab));
--- a/src/proto/if_python3.pro +++ b/src/proto/if_python3.pro @@ -3,8 +3,8 @@ int python3_enabled __ARGS((int verbose) void python3_end __ARGS((void)); int python3_loaded __ARGS((void)); void ex_py3 __ARGS((exarg_T *eap)); +void ex_py3file __ARGS((exarg_T *eap)); void ex_py3do __ARGS((exarg_T *eap)); -void ex_py3file __ARGS((exarg_T *eap)); void python3_buffer_free __ARGS((buf_T *buf)); void python3_window_free __ARGS((win_T *win)); void python3_tabpage_free __ARGS((tabpage_T *tab));
--- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -42,7 +42,6 @@ void mch_write __ARGS((char_u *s, int le void mch_delay __ARGS((long msec, int ignoreinput)); int mch_remove __ARGS((char_u *name)); void mch_breakcheck __ARGS((void)); -long_u mch_avail_mem __ARGS((int special)); int mch_wrename __ARGS((WCHAR *wold, WCHAR *wnew)); int mch_rename __ARGS((const char *pszOldFile, const char *pszNewFile)); char *default_shell __ARGS((void));