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