diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-02 22:02:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-02 22:02:32 +0200 |
| commit | b26705afb55955306ffbe2a390e02fc052802b77 (patch) | |
| tree | 03af21038da7fe265bb43bac2733805d2a5a188d | |
| parent | 690a905a0199f5ff733e5a12be9ba94ae6043ef4 (diff) | |
| download | vim-git-b26705afb55955306ffbe2a390e02fc052802b77.tar.gz | |
patch 8.1.1102: Win32 exe file contains unused codev8.1.1102
Problem: Win32 exe file contains unused code.
Solution: Remove unused #ifdefs and code. (Ken Takata, closes #4198)
| -rw-r--r-- | src/os_w32exe.c | 46 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 36 deletions
diff --git a/src/os_w32exe.c b/src/os_w32exe.c index 93817adfa..6c45ec2ea 100644 --- a/src/os_w32exe.c +++ b/src/os_w32exe.c @@ -10,7 +10,8 @@ /* * Windows GUI: main program (EXE) entry point: * - * Ron Aaron <ronaharon@yahoo.com> wrote this and the DLL support code. + * Ron Aaron <ronaharon@yahoo.com> wrote this and the (now deleted) DLL support + * code. */ #include "vim.h" @@ -20,54 +21,27 @@ # endif #endif -/* cproto doesn't create a prototype for main() */ -int _cdecl -#if defined(FEAT_GUI_MSWIN) -VimMain -#else - main -#endif - (int argc, char **argv); -static int (_cdecl *pmain)(int, char **); - -#ifndef PROTO +// cproto doesn't create a prototype for VimMain() +int _cdecl VimMain(int argc, char **argv); #ifdef FEAT_GUI void _cdecl SaveInst(HINSTANCE hInst); -static void (_cdecl *pSaveInst)(HINSTANCE); #endif +#ifndef PROTO int WINAPI WinMain( - HINSTANCE hInstance UNUSED, + HINSTANCE hInstance, HINSTANCE hPrevInst UNUSED, LPSTR lpszCmdLine UNUSED, int nCmdShow UNUSED) { int argc = 0; char **argv = NULL; -#ifdef FEAT_GUI - pSaveInst = SaveInst; -#endif - pmain = -#if defined(FEAT_GUI_MSWIN) - //&& defined(__MINGW32__) - VimMain -#else - main -#endif - ; -#ifdef FEAT_GUI - pSaveInst( -#ifdef __MINGW32__ - GetModuleHandle(NULL) -#else - hInstance -#endif - ); -#endif - pmain(argc, argv); - free_cmd_argsW(); +# ifdef FEAT_GUI + SaveInst(hInstance); +# endif + VimMain(argc, argv); return 0; } diff --git a/src/version.c b/src/version.c index fe7112807..7400a3798 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1102, +/**/ 1101, /**/ 1100, |