freebsd-ports/x11-clocks/wmclockmon/files/patch-src_main.c
Shaun Amott 519f691b1c Fix Internet time calculation.
PR:		ports/86334
Submitted by:	Frank Altpeter <frank@altpeter.de>
Patched by:	shaun (me), Soeren Straarup <xride@x12.dk> (maintainer)
Approved by:	ahze (mentor, implicit)
2006-07-18 20:56:24 +00:00

33 lines
938 B
C

--- src/main.c.orig Thu Apr 7 11:37:43 2005
+++ src/main.c Tue Jul 18 22:20:25 2006
@@ -51,7 +51,7 @@
#define FREE(data) {if (data) free(data); data = NULL;}
#define SET_STRING(str, val) {if (str) free(str); str = xstrdup(val);}
-#if defined(netbsd) || defined(openbsd) || defined(freebsd) || defined(darwin)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
# define BSDTIMEZONE
#endif
@@ -1270,10 +1270,10 @@
time_t tnow;
time(&tnow);
- timeinfos = localtime(&tnow);
if (time_mode == INTERNET) {
long localtmzone;
+ timeinfos = gmtime(&tnow);
swtime = timeinfos->tm_hour * 3600
+ timeinfos->tm_min * 60
+ timeinfos->tm_sec;
@@ -1290,6 +1290,9 @@
swtime -= 1000;
else
if (swtime < 0) swtime += 1000;
+ }
+ else {
+ timeinfos = localtime(&tnow);
}
}