summaryrefslogtreecommitdiff
path: root/comms/plptools/patches/patch-ai
blob: 6607bb45d0016b8289c7de0da2b57e4e1ef1af24 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
$NetBSD: patch-ai,v 1.3 2006/02/02 15:03:19 joerg Exp $

--- lib/psitime.cc.orig	2002-08-05 11:27:54.000000000 +0000
+++ lib/psitime.cc
@@ -63,7 +63,7 @@ PsiTime::PsiTime(const u_int32_t _ptvHi,
     psi2unix();
 }
 
-PsiTime::PsiTime(struct timeval *_utv, struct timezone *_utz = 0L) {
+PsiTime::PsiTime(struct timeval *_utv, struct timezone *_utz) {
     if (_utv != 0L)
 	utv = *_utv;
     if (_utz != 0L)
@@ -219,7 +219,11 @@ evalOffset(psi_timezone ptz, time_t time
 	    * daylight saving.
 	    */
 	    struct tm *tm = localtime(&time);
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__)
+	    offset = -tm->tm_gmtoff;
+#else
 	    offset = timezone;
+#endif
 	    if (tm->tm_isdst)
 		offset += 3600;
 	}
@@ -228,7 +232,11 @@ evalOffset(psi_timezone ptz, time_t time
     // later
     time_t now = ::time(0);
     struct tm *now_tm = localtime(&now);
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__)
+    offset -= -now_tm->tm_gmtoff;
+#else
     offset -= timezone;
+#endif
 
     offset *= 1000000;
     return offset;