Fix cygwin compilation warning on geotag.cpp

v0.27.3
Robin Mills 11 years ago
parent 3b0404e7b6
commit 94e6dcbf50

@ -417,7 +417,6 @@ time_t parseTime(const char* arg,bool bAdjust)
int timeZoneAdjust()
{
time_t now = time(NULL);
struct tm local = *localtime(&now) ;
int offset;
#if defined(_MSC_VER)
@ -426,13 +425,15 @@ int timeZoneAdjust()
offset = - (((int)TimeZoneInfo.Bias + (int)TimeZoneInfo.DaylightBias) * 60);
#elif defined(__CYGWIN__)
struct tm lcopy = *localtime(&now);
time_t gmt = timegm(&lcopy) ; // timegm modifies lcopy, so don't use local
time_t gmt = timegm(&lcopy) ; // timegm modifies lcopy
offset = (int) ( ((long signed int) gmt) - ((long signed int) now) ) ;
#elif defined(OS_SOLARIS)
struct tm local = *localtime(&now) ;
time_t local_tt = (int) mktime(&local);
time_t time_gmt = (int) mktime(gmtime(&now));
offset = time_gmt - local_tt;
#else
struct tm local = *localtime(&now) ;
offset = local.tm_gmtoff ;
#endif

Loading…
Cancel
Save