diff options
-rw-r--r-- | src/debugger.c | 2 | ||||
-rw-r--r-- | src/if_python3.c | 2 | ||||
-rw-r--r-- | src/os_unix.c | 6 | ||||
-rw-r--r-- | src/proto/if_python3.pro | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/src/debugger.c b/src/debugger.c index 66647ab464..5508ea33fc 100644 --- a/src/debugger.c +++ b/src/debugger.c @@ -1000,7 +1000,7 @@ has_profiling( } static void -prof_clear_cache() +prof_clear_cache(void) { if (!prof_cache_initialized) { diff --git a/src/if_python3.c b/src/if_python3.c index 9d53cafc74..a04cca31ae 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -2070,7 +2070,7 @@ set_ref_in_python3(int copyID) } int -python3_version() +python3_version(void) { #ifdef USE_LIMITED_API return Py_LIMITED_API; diff --git a/src/os_unix.c b/src/os_unix.c index 31f66b1371..45c6b440a5 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1858,7 +1858,7 @@ ex_xrestore(exarg_T *eap) static int test_x11_window(Display *dpy) { - int (*old_handler)(); + int (*old_handler)(Display*, XErrorEvent*); XTextProperty text_prop; old_handler = XSetErrorHandler(x_error_check); @@ -7781,9 +7781,9 @@ setup_term_clip(void) open_app_context(); if (app_context != NULL && xterm_Shell == (Widget)0) { - int (*oldhandler)(); + int (*oldhandler)(Display*, XErrorEvent*); # if defined(USING_SETJMP) - int (*oldIOhandler)(); + int (*oldIOhandler)(Display*); # endif # ifdef ELAPSED_FUNC elapsed_T start_tv; diff --git a/src/proto/if_python3.pro b/src/proto/if_python3.pro index d2bcd8c5a0..0e139b9902 100644 --- a/src/proto/if_python3.pro +++ b/src/proto/if_python3.pro @@ -10,5 +10,5 @@ void python3_window_free(win_T *win); void python3_tabpage_free(tabpage_T *tab); void do_py3eval(char_u *str, typval_T *rettv); int set_ref_in_python3(int copyID); -int python3_version(); +int python3_version(void); /* vim: set ft=c : */ diff --git a/src/version.c b/src/version.c index c258d7b4e7..f30b08e4ae 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1930, +/**/ 1929, /**/ 1928, |