diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-02 23:18:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-02 23:18:25 +0200 |
| commit | e0ab979fa7404592eaf4180e6d7d3af4c7787e8f (patch) | |
| tree | a89637e4ec7beea7dce9db08080d547bd78ff4cf /src | |
| parent | 66cd19fef1c5e86d798db164cc29f8ec2793411d (diff) | |
| download | vim-git-e0ab979fa7404592eaf4180e6d7d3af4c7787e8f.tar.gz | |
patch 8.0.0844: wrong function prototype because of missing staticv8.0.0844
Problem: Wrong function prototype because of missing static.
Solution: Add "static".
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_win32.c | 5 | ||||
| -rw-r--r-- | src/proto/os_win32.pro | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 4921b50f3..d3cab0223 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 754df4f97..4e0629867 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 2db4ca921..ee0a081bf 100644 --- 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, |