projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 4ff12b6a ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.247 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.247 | |
| 11 | Problem: Mzscheme interface minor problem. | |
| 12 | Solution: Better error message when build fails. (Sergey Khorev) | |
| 13 | Files: src/if_mzsch.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.246/src/if_mzsch.c 2009-07-09 20:06:30.000000000 +0200 | |
| 17 | --- src/if_mzsch.c 2009-09-11 11:20:39.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 635,642 **** | |
| 20 | #endif /* DYNAMIC_MZSCHEME */ | |
| 21 | ||
| 22 | /* need to put it here for dynamic stuff to work */ | |
| 23 | ! #ifdef INCLUDE_MZSCHEME_BASE | |
| 24 | # include "mzscheme_base.c" | |
| 25 | #endif | |
| 26 | ||
| 27 | /* | |
| 28 | --- 635,644 ---- | |
| 29 | #endif /* DYNAMIC_MZSCHEME */ | |
| 30 | ||
| 31 | /* need to put it here for dynamic stuff to work */ | |
| 32 | ! #if defined(INCLUDE_MZSCHEME_BASE) | |
| 33 | # include "mzscheme_base.c" | |
| 34 | + #elif MZSCHEME_VERSION_MAJOR >= 400 | |
| 35 | + # error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes | |
| 36 | #endif | |
| 37 | ||
| 38 | /* | |
| 39 | *************** | |
| 40 | *** 875,888 **** | |
| 41 | #ifdef INCLUDE_MZSCHEME_BASE | |
| 42 | { | |
| 43 | /* | |
| 44 | ! * versions 4.x do not provide Scheme bindings by defaults | |
| 45 | * we need to add them explicitly | |
| 46 | */ | |
| 47 | Scheme_Object *scheme_base_symbol = NULL; | |
| 48 | MZ_GC_DECL_REG(1); | |
| 49 | MZ_GC_VAR_IN_REG(0, scheme_base_symbol); | |
| 50 | MZ_GC_REG(); | |
| 51 | ! /* invoke function from generated and included base.c */ | |
| 52 | declare_modules(environment); | |
| 53 | scheme_base_symbol = scheme_intern_symbol("scheme/base"); | |
| 54 | MZ_GC_CHECK(); | |
| 55 | --- 877,890 ---- | |
| 56 | #ifdef INCLUDE_MZSCHEME_BASE | |
| 57 | { | |
| 58 | /* | |
| 59 | ! * versions 4.x do not provide Scheme bindings by default | |
| 60 | * we need to add them explicitly | |
| 61 | */ | |
| 62 | Scheme_Object *scheme_base_symbol = NULL; | |
| 63 | MZ_GC_DECL_REG(1); | |
| 64 | MZ_GC_VAR_IN_REG(0, scheme_base_symbol); | |
| 65 | MZ_GC_REG(); | |
| 66 | ! /* invoke function from generated and included mzscheme_base.c */ | |
| 67 | declare_modules(environment); | |
| 68 | scheme_base_symbol = scheme_intern_symbol("scheme/base"); | |
| 69 | MZ_GC_CHECK(); | |
| 70 | *** ../vim-7.2.246/src/version.c 2009-09-11 11:30:12.000000000 +0200 | |
| 71 | --- src/version.c 2009-09-11 11:53:59.000000000 +0200 | |
| 72 | *************** | |
| 73 | *** 678,679 **** | |
| 74 | --- 678,681 ---- | |
| 75 | { /* Add new patch number below this line */ | |
| 76 | + /**/ | |
| 77 | + 247, | |
| 78 | /**/ | |
| 79 | ||
| 80 | -- | |
| 81 | Your fault: core dumped | |
| 82 | ||
| 83 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 84 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 85 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 86 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |