0
0
mirror of https://github.com/vim/vim.git synced 2025-10-12 06:44:06 -04:00

patch 7.4.1348

Problem:    More compiler warnings. (John Marriott)
Solution:   Add type casts, remove unused variable.
This commit is contained in:
Bram Moolenaar
2016-02-18 20:46:39 +01:00
parent 8b778d5599
commit 7f0608fb52
2 changed files with 8 additions and 7 deletions

View File

@@ -57,7 +57,6 @@ directx_enabled(void)
gui_mch_set_rendering_options(char_u *s)
{
#ifdef FEAT_DIRECTX
int retval = FAIL;
char_u *p, *q;
int dx_enable = 0;
@@ -95,36 +94,36 @@ gui_mch_set_rendering_options(char_u *s)
else if (STRCMP(name, "gamma") == 0)
{
dx_flags |= 1 << 0;
dx_gamma = (float)atof(value);
dx_gamma = (float)atof((char *)value);
}
else if (STRCMP(name, "contrast") == 0)
{
dx_flags |= 1 << 1;
dx_contrast = (float)atof(value);
dx_contrast = (float)atof((char *)value);
}
else if (STRCMP(name, "level") == 0)
{
dx_flags |= 1 << 2;
dx_level = (float)atof(value);
dx_level = (float)atof((char *)value);
}
else if (STRCMP(name, "geom") == 0)
{
dx_flags |= 1 << 3;
dx_geom = atoi(value);
dx_geom = atoi((char *)value);
if (dx_geom < 0 || dx_geom > 2)
return FAIL;
}
else if (STRCMP(name, "renmode") == 0)
{
dx_flags |= 1 << 4;
dx_renmode = atoi(value);
dx_renmode = atoi((char *)value);
if (dx_renmode < 0 || dx_renmode > 6)
return FAIL;
}
else if (STRCMP(name, "taamode") == 0)
{
dx_flags |= 1 << 5;
dx_taamode = atoi(value);
dx_taamode = atoi((char *)value);
if (dx_taamode < 0 || dx_taamode > 3)
return FAIL;
}

View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1348,
/**/
1347,
/**/