diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-13 18:24:29 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-13 18:24:29 +0100 |
| commit | 77cf82011e2e2c3a21a50e4ab2ade38f0e35863d (patch) | |
| tree | 088d8d58dc40ff426c4e664c7ae9f701770e8eda /runtime/datetime.c | |
| parent | 2ab69c601923374f3d0ecb51e3f8a021d2d7e519 (diff) | |
| parent | b96693cef7343aaf0406fc242ebd17c8981051d5 (diff) | |
| download | rsyslog-77cf82011e2e2c3a21a50e4ab2ade38f0e35863d.tar.gz rsyslog-77cf82011e2e2c3a21a50e4ab2ade38f0e35863d.tar.bz2 rsyslog-77cf82011e2e2c3a21a50e4ab2ade38f0e35863d.zip | |
Merge branch 'v6-stable' into v7-stable
Diffstat (limited to 'runtime/datetime.c')
| -rw-r--r-- | runtime/datetime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/datetime.c b/runtime/datetime.c index 53bc1657..c03abab9 100644 --- a/runtime/datetime.c +++ b/runtime/datetime.c @@ -77,7 +77,7 @@ timeval2syslogTime(struct timeval *tp, struct syslogTime *t) /* Solaris uses a different method of exporting the time zone. * It is UTC - localtime, which is the opposite sign of mins east of GMT. */ - lBias = -(daylight ? altzone : timezone); + lBias = -(tm->tm_isdst ? altzone : timezone); # elif defined(__hpux) lBias = tz.tz_dsttime ? - tz.tz_minuteswest : 0; # else |