mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.3.732
Problem: Compiler warnings for function arguments. Solution: Use inteptr_t instead of long.
This commit is contained in:
parent
7854e3abcf
commit
02e14d67b9
@ -142,7 +142,7 @@ static int vim_error_check(void);
|
|||||||
static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);
|
static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);
|
||||||
static void startup_mzscheme(void);
|
static void startup_mzscheme(void);
|
||||||
static char *string_to_line(Scheme_Object *obj);
|
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_printf(char *format, ...);
|
||||||
static void do_flush(void);
|
static void do_flush(void);
|
||||||
static Scheme_Object *_apply_thunk_catch_exceptions(
|
static Scheme_Object *_apply_thunk_catch_exceptions(
|
||||||
@ -1349,8 +1349,9 @@ do_intrnl_output(char *mesg, int error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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);
|
do_intrnl_output(mesg, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1370,7 +1371,7 @@ do_printf(char *format, ...)
|
|||||||
do_flush(void)
|
do_flush(void)
|
||||||
{
|
{
|
||||||
char *buff;
|
char *buff;
|
||||||
long length;
|
intptr_t length;
|
||||||
|
|
||||||
buff = scheme_get_sized_string_output(curerr, &length);
|
buff = scheme_get_sized_string_output(curerr, &length);
|
||||||
MZ_GC_CHECK();
|
MZ_GC_CHECK();
|
||||||
@ -2588,7 +2589,7 @@ string_to_line(Scheme_Object *obj)
|
|||||||
{
|
{
|
||||||
char *scheme_str = NULL;
|
char *scheme_str = NULL;
|
||||||
char *vim_str = NULL;
|
char *vim_str = NULL;
|
||||||
long len;
|
intptr_t len;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
scheme_str = scheme_display_to_string(obj, &len);
|
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
|
* are replacing a single line, and we must replace it with
|
||||||
* a single line.
|
* a single line.
|
||||||
*/
|
*/
|
||||||
if (memchr(scheme_str, '\n', len))
|
if (memchr(scheme_str, '\n', (size_t)len))
|
||||||
scheme_signal_error(_("string cannot contain newlines"));
|
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
|
/* Create a copy of the string, with internal nulls replaced by
|
||||||
* newline characters, as is the vim convention.
|
* newline characters, as is the vim convention.
|
||||||
|
@ -725,6 +725,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
732,
|
||||||
/**/
|
/**/
|
||||||
731,
|
731,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user