From e0ab979fa7404592eaf4180e6d7d3af4c7787e8f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 2 Aug 2017 23:18:25 +0200 Subject: [PATCH] patch 8.0.0844: wrong function prototype because of missing static Problem: Wrong function prototype because of missing static. Solution: Add "static". --- src/os_win32.c | 5 +++-- src/proto/os_win32.pro | 2 -- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/os_win32.c b/src/os_win32.c index 4921b50f39..d3cab02234 100644 --- 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 *domainname UNUSED) 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 index 754df4f975..4e0629867a 100644 --- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -4,8 +4,6 @@ HINSTANCE find_imported_module_by_funcname(HINSTANCE hInst, const char *funcname 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 index 2db4ca9214..ee0a081bf8 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 844, /**/ 843, /**/