0
0
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00

patch 8.1.1102: Win32 exe file contains unused code

Problem:    Win32 exe file contains unused code.
Solution:   Remove unused #ifdefs and code. (Ken Takata, closes #4198)
This commit is contained in:
Bram Moolenaar
2019-04-02 22:02:32 +02:00
parent 690a905a01
commit b26705afb5
2 changed files with 12 additions and 36 deletions

View File

@@ -10,7 +10,8 @@
/* /*
* Windows GUI: main program (EXE) entry point: * 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" #include "vim.h"
@@ -20,54 +21,27 @@
# endif # endif
#endif #endif
/* cproto doesn't create a prototype for main() */ // cproto doesn't create a prototype for VimMain()
int _cdecl int _cdecl VimMain(int argc, char **argv);
#if defined(FEAT_GUI_MSWIN)
VimMain
#else
main
#endif
(int argc, char **argv);
static int (_cdecl *pmain)(int, char **);
#ifndef PROTO
#ifdef FEAT_GUI #ifdef FEAT_GUI
void _cdecl SaveInst(HINSTANCE hInst); void _cdecl SaveInst(HINSTANCE hInst);
static void (_cdecl *pSaveInst)(HINSTANCE);
#endif #endif
#ifndef PROTO
int WINAPI int WINAPI
WinMain( WinMain(
HINSTANCE hInstance UNUSED, HINSTANCE hInstance,
HINSTANCE hPrevInst UNUSED, HINSTANCE hPrevInst UNUSED,
LPSTR lpszCmdLine UNUSED, LPSTR lpszCmdLine UNUSED,
int nCmdShow UNUSED) int nCmdShow UNUSED)
{ {
int argc = 0; int argc = 0;
char **argv = NULL; 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; return 0;
} }

View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1102,
/**/ /**/
1101, 1101,
/**/ /**/