changeset 11929:3457728d1a58 v8.0.0844

patch 8.0.0844: wrong function prototype because of missing static commit https://github.com/vim/vim/commit/e0ab979fa7404592eaf4180e6d7d3af4c7787e8f Author: Bram Moolenaar <Bram@vim.org> 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".
author Christian Brabandt <cb@256bit.org>
date Wed, 02 Aug 2017 23:30:04 +0200
parents 4c1d0c774d51
children c9767bd7bef6
files src/os_win32.c src/proto/os_win32.pro src/version.c
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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);
--- 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,