diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-11-28 15:37:51 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-11-28 15:37:51 +0100 |
| commit | 02e14d67b95cc131c93329e280c38bf7d6ad76ae (patch) | |
| tree | 8c761e9f99979a5ead7a759e1184c22c1a3c81f3 | |
| parent | 7854e3abcf71e00d7053603737ed04560fd70115 (diff) | |
| download | vim-git-7.3.732.tar.gz | |
updated for version 7.3.732v7.3.732
Problem: Compiler warnings for function arguments.
Solution: Use inteptr_t instead of long.
| -rw-r--r-- | src/if_mzsch.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/if_mzsch.c b/src/if_mzsch.c index d6ee4b9c5..9a92fee87 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -142,7 +142,7 @@ static int vim_error_check(void); static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what); static void startup_mzscheme(void); static char *string_to_line(Scheme_Object *obj); -static void do_output(char *mesg, long len); +static void do_output(char *mesg, intptr_t len); static void do_printf(char *format, ...); static void do_flush(void); static Scheme_Object *_apply_thunk_catch_exceptions( @@ -1349,8 +1349,9 @@ do_intrnl_output(char *mesg, int error) } static void -do_output(char *mesg, long len UNUSED) +do_output(char *mesg, intptr_t len UNUSED) { + /* TODO: use len, the string may not be NUL terminated */ do_intrnl_output(mesg, 0); } @@ -1370,7 +1371,7 @@ do_printf(char *format, ...) do_flush(void) { char *buff; - long length; + intptr_t length; buff = scheme_get_sized_string_output(curerr, &length); MZ_GC_CHECK(); @@ -2588,7 +2589,7 @@ string_to_line(Scheme_Object *obj) { char *scheme_str = NULL; char *vim_str = NULL; - long len; + intptr_t len; int i; scheme_str = scheme_display_to_string(obj, &len); @@ -2597,10 +2598,10 @@ string_to_line(Scheme_Object *obj) * are replacing a single line, and we must replace it with * a single line. */ - if (memchr(scheme_str, '\n', len)) + if (memchr(scheme_str, '\n', (size_t)len)) scheme_signal_error(_("string cannot contain newlines")); - vim_str = (char *)alloc(len + 1); + vim_str = (char *)alloc((int)(len + 1)); /* Create a copy of the string, with internal nulls replaced by * newline characters, as is the vim convention. diff --git a/src/version.c b/src/version.c index c060e1ae9..d537c3775 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 732, +/**/ 731, /**/ 730, |