diff options
| author | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-20 09:43:52 +0000 |
|---|---|---|
| committer | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-04-20 09:43:52 +0000 |
| commit | adaf0362f0e0280d7b813790dc0b33776636754e (patch) | |
| tree | b80312c6827358f9739e8862d310f71e085817bc /libjava/java/lang/natSystem.cc | |
| parent | 86565fe7cc17850befa9d37ab13f701722e488d9 (diff) | |
| download | gcc-adaf0362f0e0280d7b813790dc0b33776636754e.tar.gz | |
* java/lang/natSystem.cc (getSystemTimeZone): Adjust for DST.
* java/text/SimpleDateFormat.java
(indexInArray): Removed private method.
(processYear): Removed private method.
(parseLenient): Removed private method.
(parseLeadingZeros): Removed private method.
(parseStrict): Removed private method.
(expect): Added new private method.
(parse): Reverted to pre-Classpath merge version with minor fixes.
* java/util/natGregorianCalendar.cc (computeTime): Handle strict
calendars.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41456 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang/natSystem.cc')
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index abf62caae8a..57e135c7db5 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -249,9 +249,11 @@ java::lang::System::getSystemTimeZone (void) mktime(tim = localtime(¤t_time)); #ifdef STRUCT_TM_HAS_GMTOFF - tzoffset = -(tim->tm_gmtoff); // tm_gmtoff is secs EAST of UTC. + // tm_gmtoff is secs EAST of UTC. + tzoffset = -(tim->tm_gmtoff) + tim->tm_isdst * 3600L; #elif HAVE_TIMEZONE - tzoffset = timezone; // timezone is secs WEST of UTC. + // timezone is secs WEST of UTC. + tzoffset = timezone; #else // FIXME: there must be another global if neither tm_gmtoff nor timezone // is available, esp. if tzname is valid. |