# HG changeset patch # User Christian Brabandt # Date 1501709404 -7200 # Node ID 3457728d1a58f1cacc0b1550be91b4a38d346e01 # Parent 4c1d0c774d519f9798f10bf927b37ccc831d2a11 patch 8.0.0844: wrong function prototype because of missing static commit https://github.com/vim/vim/commit/e0ab979fa7404592eaf4180e6d7d3af4c7787e8f Author: Bram Moolenaar Date: Wed Aug 2 23:18:25 2017 +0200 patch 8.0.0844: wrong function prototype because of missing static Problem: Wrong function prototype because of missing static. Solution: Add "static". diff --git a/src/os_win32.c b/src/os_win32.c --- a/src/os_win32.c +++ b/src/os_win32.c @@ -111,6 +111,7 @@ typedef int HICON; typedef int HINSTANCE; typedef int HWND; typedef int INPUT_RECORD; +typedef int INT; typedef int KEY_EVENT_RECORD; typedef int LOGFONT; typedef int LPBOOL; @@ -657,13 +658,13 @@ null_libintl_textdomain(const char *doma return NULL; } - int + static int null_libintl_putenv(const char *envstring UNUSED) { return 0; } - int + static int null_libintl_wputenv(const wchar_t *envstring UNUSED) { return 0; diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro --- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -4,8 +4,6 @@ HINSTANCE find_imported_module_by_funcna void *get_dll_import_func(HINSTANCE hInst, const char *funcname); int dyn_libintl_init(void); void dyn_libintl_end(void); -int null_libintl_putenv(const char *envstring); -int null_libintl_wputenv(const wchar_t *envstring); void PlatformId(void); void mch_setmouse(int on); void mch_update_cursor(void); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 844, +/**/ 843, /**/ 842,