To: vim_dev@googlegroups.com
Subject: Patch 8.1.1102
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.1102
Problem:    Win32 exe file contains unused code.
Solution:   Remove unused #ifdefs and code. (Ken Takata, closes #4198)
Files:	    src/os_w32exe.c


*** ../vim-8.1.1101/src/os_w32exe.c	2019-03-28 22:43:12.103997449 +0100
--- src/os_w32exe.c	2019-04-02 22:01:29.722718578 +0200
***************
*** 10,16 ****
  /*
   * Windows GUI: main program (EXE) entry point:
   *
!  * Ron Aaron <ronaharon@yahoo.com> wrote this and the DLL support code.
   */
  #include "vim.h"
  
--- 10,17 ----
  /*
   * Windows GUI: main program (EXE) entry point:
   *
!  * Ron Aaron <ronaharon@yahoo.com> wrote this and the (now deleted) DLL support
!  * code.
   */
  #include "vim.h"
  
***************
*** 20,73 ****
  # 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
  #ifdef FEAT_GUI
  void _cdecl SaveInst(HINSTANCE hInst);
- static void (_cdecl *pSaveInst)(HINSTANCE);
  #endif
  
      int WINAPI
  WinMain(
!     HINSTANCE	hInstance UNUSED,
      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();
  
      return 0;
  }
--- 21,47 ----
  # endif
  #endif
  
! // cproto doesn't create a prototype for VimMain()
! int _cdecl VimMain(int argc, char **argv);
  #ifdef FEAT_GUI
  void _cdecl SaveInst(HINSTANCE hInst);
  #endif
  
+ #ifndef PROTO
      int WINAPI
  WinMain(
!     HINSTANCE	hInstance,
      HINSTANCE	hPrevInst UNUSED,
      LPSTR	lpszCmdLine UNUSED,
      int		nCmdShow UNUSED)
  {
      int		argc = 0;
      char	**argv = NULL;
  
! # ifdef FEAT_GUI
!     SaveInst(hInstance);
! # endif
!     VimMain(argc, argv);
  
      return 0;
  }
*** ../vim-8.1.1101/src/version.c	2019-04-02 21:45:38.260326643 +0200
--- src/version.c	2019-04-02 22:00:18.847163631 +0200
***************
*** 773,774 ****
--- 773,776 ----
  {   /* Add new patch number below this line */
+ /**/
+     1102,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
182. You may not know what is happening in the world, but you know
     every bit of net-gossip there is.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///