X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fenvironment%2Fmetar.cxx;h=79401e39419d3680ae0495f1d68b34da42cfb987;hb=aa2ed5fb0cb16766f440231f23581bb90e9963d8;hp=9342c5482cd57be5a88186365bba48b515ccba7f;hpb=38b37a068d4d74b5228aaa7a499fe3fad2358172;p=simgear.git diff --git a/simgear/environment/metar.cxx b/simgear/environment/metar.cxx index 9342c548..79401e39 100644 --- a/simgear/environment/metar.cxx +++ b/simgear/environment/metar.cxx @@ -159,7 +159,7 @@ void SGMetar::useCurrentDate() { struct tm now; time_t now_sec = time(0); -#if defined( _MSC_VER ) || defined ( __MINGW32__ ) +#ifdef _WIN32 now = *gmtime(&now_sec); #else gmtime_r(&now_sec, &now); @@ -493,7 +493,6 @@ bool SGMetar::scanVisibility() distance = i; } else { // M?(\d{1,2}|\d{1,2}/\d{1,2}|\d{1,2} \d{1,2}/\d{1,2})(SM|KM) - modifier = 0; if (*m == 'M') m++, modifier = SGMetarVisibility::LESS_THAN; @@ -1182,7 +1181,7 @@ const struct Token *SGMetar::scanToken(char **str, const struct Token *list) { const struct Token *longest = 0; int maxlen = 0, len; - char *s; + const char *s; for (int i = 0; (s = list[i].id); i++) { len = strlen(s); if (!strncmp(s, *str, len) && len > maxlen) {