diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-07-06 17:43:08 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-07-06 17:43:08 +0000 |
| commit | e2a49d8e5e31e85d7a227eb2747ede63b9c6f85d (patch) | |
| tree | ca3997dc9618c761be2248886204992e25f7b258 /src | |
| parent | 6a5160696676716b22bfe1dde9f1b0c0b41dc49f (diff) | |
| download | vim-git-e2a49d8e5e31e85d7a227eb2747ede63b9c6f85d.tar.gz | |
updated for version 7.1-021v7.1.021
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_mzsch.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/if_mzsch.c b/src/if_mzsch.c index 9efb62184..28bf53def 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -308,6 +308,8 @@ static void (*dll_scheme_set_param)(Scheme_Config *c, int pos, static Scheme_Config *(*dll_scheme_current_config)(void); static Scheme_Object *(*dll_scheme_char_string_to_byte_string) (Scheme_Object *s); +static Scheme_Object *(*dll_scheme_char_string_to_path) + (Scheme_Object *s); # endif /* arrays are imported directly */ @@ -398,6 +400,8 @@ static Scheme_Object *(*dll_scheme_char_string_to_byte_string) # define scheme_current_config dll_scheme_current_config # define scheme_char_string_to_byte_string \ dll_scheme_char_string_to_byte_string +# define scheme_char_string_to_path \ + dll_scheme_char_string_to_path # endif typedef struct @@ -498,6 +502,8 @@ static Thunk_Info mzsch_imports[] = { {"scheme_current_config", (void **)&dll_scheme_current_config}, {"scheme_char_string_to_byte_string", (void **)&dll_scheme_char_string_to_byte_string}, + {"scheme_char_string_to_path", + (void **)&dll_scheme_char_string_to_path}, # endif {NULL, NULL}}; @@ -773,7 +779,15 @@ startup_mzscheme(void) #ifdef MZSCHEME_COLLECTS /* setup 'current-library-collection-paths' parameter */ scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS, - scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS))); + scheme_make_pair( +# if MZSCHEME_VERSION_MAJOR >= 299 + scheme_char_string_to_path( + scheme_byte_string_to_char_string( + scheme_make_byte_string(MZSCHEME_COLLECTS))), +# else + scheme_make_string(MZSCHEME_COLLECTS), +# endif + scheme_null)); #endif #ifdef HAVE_SANDBOX /* setup sandbox guards */ diff --git a/src/version.c b/src/version.c index b72c713cd..3772ef6cb 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 21, +/**/ 20, /**/ 19, |