From 7f0608fb5219645d776fadfe13efb867c2460698 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 18 Feb 2016 20:46:39 +0100 Subject: patch 7.4.1348 Problem: More compiler warnings. (John Marriott) Solution: Add type casts, remove unused variable. --- src/gui_w32.c | 13 ++++++------- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui_w32.c b/src/gui_w32.c index ac0fb11f6..b496166e3 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -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; } diff --git a/src/version.c b/src/version.c index 31e15c335..d02a380b4 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1348, /**/ 1347, /**/ -- cgit v1.2.1