diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-26 12:55:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-26 12:55:09 +0200 |
| commit | 54b6352c6f0617ff9c963588ccc7d31815348029 (patch) | |
| tree | 00690616d982b1c8f522fb251eb95ed792562938 /src/if_mzsch.c | |
| parent | 78c7e274f27c68bf86b0a68411b128c6945d1f6a (diff) | |
| download | vim-git-54b6352c6f0617ff9c963588ccc7d31815348029.tar.gz | |
patch 7.4.2254v7.4.2254
Problem: Compiler warnings in MzScheme code.
Solution: Add UNUSED. Remove unreachable code.
Diffstat (limited to 'src/if_mzsch.c')
| -rw-r--r-- | src/if_mzsch.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/if_mzsch.c b/src/if_mzsch.c index 41388109e..eacb80381 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -1008,8 +1008,13 @@ static intptr_t _tls_index = 0; # 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() +mzscheme_main(void) { int argc = 0; char *argv = NULL; @@ -1036,9 +1041,8 @@ mzscheme_main() } static int -mzscheme_env_main(Scheme_Env *env, int argc, char **argv) +mzscheme_env_main(Scheme_Env *env, int argc UNUSED, char **argv UNUSED) { - int vim_main_result; #ifdef TRAMPOLINED_MZVIM_STARTUP /* Scheme has created the environment for us */ environment = env; @@ -1055,17 +1059,10 @@ mzscheme_env_main(Scheme_Env *env, int argc, char **argv) # 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; + vim_main2(); + /* not reached, vim_main2() will loop until exit() */ + + return 0; } static Scheme_Object* |