thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1863

Browse Source 
Problem:    Compiler warnings on Win64.
Solution:   Adjust types, add type casts. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2016-06-01 20:31:43 +02:00
parent 18dfb4404a
commit 9b0ac229bc
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/if_mzsch.c
View File

@@ -545,7 +545,7 @@ static void (*dll_scheme_set_config_path)(Scheme_Object *p);
# if MZSCHEME_VERSION_MAJOR >= 500 # if MZSCHEME_VERSION_MAJOR >= 500
# if defined(IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS) || defined(IMPLEMENT_THREAD_LOCAL_EXTERNALLY_VIA_PROC) # if defined(IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS) || defined(IMPLEMENT_THREAD_LOCAL_EXTERNALLY_VIA_PROC)
/* define as function for macro in schshread.h */ /* define as function for macro in schthread.h */
Thread_Local_Variables * Thread_Local_Variables *
scheme_external_get_thread_local_variables(void) scheme_external_get_thread_local_variables(void)
{ {
@@ -894,7 +894,7 @@ static void remove_timer(void);
/* timers are presented in GUI only */ /* timers are presented in GUI only */
# if defined(FEAT_GUI_W32) # if defined(FEAT_GUI_W32)
static void CALLBACK static void CALLBACK
timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT idEvent UNUSED, DWORD dwTime UNUSED) timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT_PTR idEvent UNUSED, DWORD dwTime UNUSED)
# elif defined(FEAT_GUI_GTK) # elif defined(FEAT_GUI_GTK)
# if GTK_CHECK_VERSION(3,0,0) # if GTK_CHECK_VERSION(3,0,0)
static gboolean static gboolean
@@ -3571,7 +3571,7 @@ raise_vim_exn(const char *add_info)
info = scheme_make_byte_string(add_info); info = scheme_make_byte_string(add_info);
MZ_GC_CHECK(); MZ_GC_CHECK();
c_string = scheme_format_utf8(fmt, STRLEN(fmt), 1, &info, NULL); c_string = scheme_format_utf8(fmt, (int)STRLEN(fmt), 1, &info, NULL);
MZ_GC_CHECK(); MZ_GC_CHECK();
byte_string = scheme_make_byte_string(c_string); byte_string = scheme_make_byte_string(c_string);
MZ_GC_CHECK(); MZ_GC_CHECK();

7
src/if_perl.xs
View File

@@ -1075,7 +1075,8 @@ perl_to_vim(SV *sv, typval_T *rettv)
{ {
size_t len = 0; size_t len = 0;
char * str_from = SvPV(sv, len); char * str_from = SvPV(sv, len);
char_u *str_to = (char_u*)alloc(sizeof(char_u) * (len + 1)); char_u *str_to = (char_u*)alloc(
(unsigned)(sizeof(char_u) * (len + 1)));
if (str_to) { if (str_to) {
str_to[len] = '\0'; str_to[len] = '\0';
@@ -1370,13 +1371,13 @@ PerlIOVim_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
char_u *str; char_u *str;
PerlIOVim * s = PerlIOSelf(f, PerlIOVim); PerlIOVim * s = PerlIOSelf(f, PerlIOVim);
str = vim_strnsave((char_u *)vbuf, count); str = vim_strnsave((char_u *)vbuf, (int)count);
if (str == NULL) if (str == NULL)
return 0; return 0;
msg_split((char_u *)str, s->attr); msg_split((char_u *)str, s->attr);
vim_free(str); vim_free(str);
return count; return (SSize_t)count;
} }
static PERLIO_FUNCS_DECL(PerlIO_Vim) = { static PERLIO_FUNCS_DECL(PerlIO_Vim) = {

2
src/if_ruby.c
View File

@@ -733,7 +733,7 @@ vim_str2rb_enc_str(const char *s)
vim_free(sval); vim_free(sval);
if (enc) if (enc)
{ {
return rb_enc_str_new(s, strlen(s), enc); return rb_enc_str_new(s, (long)strlen(s), enc);
} }
} }
#endif #endif

4
src/version.c
View File

@@ -753,6 +753,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 */
/**/
1863,
/**/ /**/
1862, 1862,
/**/ /**/
@@ -5077,7 +5079,7 @@ do_intro_line(
if (*mesg == ' ') if (*mesg == ' ')
{ {
vim_strncpy(modby, (char_u *)_("Modified by "), MODBY_LEN - 1); vim_strncpy(modby, (char_u *)_("Modified by "), MODBY_LEN - 1);
l = STRLEN(modby); l = (int)STRLEN(modby);
vim_strncpy(modby + l, (char_u *)MODIFIED_BY, MODBY_LEN - l - 1); vim_strncpy(modby + l, (char_u *)MODIFIED_BY, MODBY_LEN - l - 1);
mesg = modby; mesg = modby;
} }