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

Patch 7.4.2254
Problem:    Compiler warnings in MzScheme code.
Solution:   Add UNUSED.  Remove unreachable code.
Files:      src/if_mzsch.c


*** ../vim-7.4.2253/src/if_mzsch.c	2016-08-07 15:19:22.204295369 +0200
--- src/if_mzsch.c	2016-08-26 12:52:42.492233695 +0200
***************
*** 1008,1015 ****
  # endif
  #endif
  
      int
! mzscheme_main()
  {
      int	    argc = 0;
      char    *argv = NULL;
--- 1008,1020 ----
  # endif
  #endif
  
+ /*
+  * mzscheme_main() is called early in main().
+  * We may call scheme_main_setup() which calls mzscheme_env_main() which then
+  * trampolines into vim_main2(), which never returns.
+  */
      int
! mzscheme_main(void)
  {
      int	    argc = 0;
      char    *argv = NULL;
***************
*** 1036,1044 ****
  }
  
      static int
! mzscheme_env_main(Scheme_Env *env, int argc, char **argv)
  {
-     int vim_main_result;
  #ifdef TRAMPOLINED_MZVIM_STARTUP
      /* Scheme has created the environment for us */
      environment = env;
--- 1041,1048 ----
  }
  
      static int
! mzscheme_env_main(Scheme_Env *env, int argc UNUSED, char **argv UNUSED)
  {
  #ifdef TRAMPOLINED_MZVIM_STARTUP
      /* Scheme has created the environment for us */
      environment = env;
***************
*** 1055,1071 ****
  # endif
  #endif
  
!     /* mzscheme_main is called as a trampoline from main.
!      * We trampoline into vim_main2
!      * Passing argc, argv through from mzscheme_main
!      */
!     vim_main_result = vim_main2();
! #if !defined(TRAMPOLINED_MZVIM_STARTUP) && defined(MZ_PRECISE_GC)
!     /* releasing dummy */
!     MZ_GC_REG();
!     MZ_GC_UNREG();
! #endif
!     return vim_main_result;
  }
  
      static Scheme_Object*
--- 1059,1068 ----
  # endif
  #endif
  
!     vim_main2();
!     /* not reached, vim_main2() will loop until exit() */
! 
!     return 0;
  }
  
      static Scheme_Object*
*** ../vim-7.4.2253/src/version.c	2016-08-25 23:19:25.675805192 +0200
--- src/version.c	2016-08-26 12:54:10.563507884 +0200
***************
*** 765,766 ****
--- 765,768 ----
  {   /* Add new patch number below this line */
+ /**/
+     2254,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
81. At social functions you introduce your husband as "my domain server."

 /// 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    ///