7518adf
To: vim-dev@vim.org
7518adf
Subject: Patch 7.2.247
7518adf
Fcc: outbox
7518adf
From: Bram Moolenaar <Bram@moolenaar.net>
7518adf
Mime-Version: 1.0
7518adf
Content-Type: text/plain; charset=UTF-8
7518adf
Content-Transfer-Encoding: 8bit
7518adf
------------
7518adf
7518adf
Patch 7.2.247
7518adf
Problem:    Mzscheme interface minor problem.
7518adf
Solution:   Better error message when build fails. (Sergey Khorev)
7518adf
Files:	    src/if_mzsch.c
7518adf
7518adf
7518adf
*** ../vim-7.2.246/src/if_mzsch.c	2009-07-09 20:06:30.000000000 +0200
7518adf
--- src/if_mzsch.c	2009-09-11 11:20:39.000000000 +0200
7518adf
***************
7518adf
*** 635,642 ****
7518adf
  #endif /* DYNAMIC_MZSCHEME */
7518adf
  
7518adf
  /* need to put it here for dynamic stuff to work */
7518adf
! #ifdef INCLUDE_MZSCHEME_BASE
7518adf
  # include "mzscheme_base.c"
7518adf
  #endif
7518adf
  
7518adf
  /*
7518adf
--- 635,644 ----
7518adf
  #endif /* DYNAMIC_MZSCHEME */
7518adf
  
7518adf
  /* need to put it here for dynamic stuff to work */
7518adf
! #if defined(INCLUDE_MZSCHEME_BASE)
7518adf
  # include "mzscheme_base.c"
7518adf
+ #elif MZSCHEME_VERSION_MAJOR >= 400
7518adf
+ # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
7518adf
  #endif
7518adf
  
7518adf
  /*
7518adf
***************
7518adf
*** 875,888 ****
7518adf
  #ifdef INCLUDE_MZSCHEME_BASE
7518adf
      {
7518adf
  	/*
7518adf
! 	 * versions 4.x do not provide Scheme bindings by defaults
7518adf
  	 * we need to add them explicitly
7518adf
  	 */
7518adf
  	Scheme_Object *scheme_base_symbol = NULL;
7518adf
  	MZ_GC_DECL_REG(1);
7518adf
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
7518adf
  	MZ_GC_REG();
7518adf
! 	/* invoke function from generated and included base.c */
7518adf
  	declare_modules(environment);
7518adf
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
7518adf
  	MZ_GC_CHECK();
7518adf
--- 877,890 ----
7518adf
  #ifdef INCLUDE_MZSCHEME_BASE
7518adf
      {
7518adf
  	/*
7518adf
! 	 * versions 4.x do not provide Scheme bindings by default
7518adf
  	 * we need to add them explicitly
7518adf
  	 */
7518adf
  	Scheme_Object *scheme_base_symbol = NULL;
7518adf
  	MZ_GC_DECL_REG(1);
7518adf
  	MZ_GC_VAR_IN_REG(0, scheme_base_symbol);
7518adf
  	MZ_GC_REG();
7518adf
! 	/* invoke function from generated and included mzscheme_base.c */
7518adf
  	declare_modules(environment);
7518adf
  	scheme_base_symbol = scheme_intern_symbol("scheme/base");
7518adf
  	MZ_GC_CHECK();
7518adf
*** ../vim-7.2.246/src/version.c	2009-09-11 11:30:12.000000000 +0200
7518adf
--- src/version.c	2009-09-11 11:53:59.000000000 +0200
7518adf
***************
7518adf
*** 678,679 ****
7518adf
--- 678,681 ----
7518adf
  {   /* Add new patch number below this line */
7518adf
+ /**/
7518adf
+     247,
7518adf
  /**/
7518adf
7518adf
-- 
7518adf
Your fault: core dumped
7518adf
7518adf
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
7518adf
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
7518adf
\\\        download, build and distribute -- http://www.A-A-P.org        ///
7518adf
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///