diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-01 20:59:24 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-01 20:59:24 +0000 |
| commit | 4787bb169228b1388f7c1cc2f65addffe9e3c647 (patch) | |
| tree | 6cff204b32d7948ab8b445aab320aab3819ec115 /libjava/java/util | |
| parent | 175c55c0e7749087da85bf6831293407a4d0cba9 (diff) | |
| download | gcc-4787bb169228b1388f7c1cc2f65addffe9e3c647.tar.gz | |
2006-08-01 Andreas Tobler <a.tobler@schweiz.ch>
* gnu/classpath/natSystemProperties.cc: Add additional check for
getpwuid_r on _POSIX_PTHREAD_SEMANTICS.
(SystemProperties::insertSystemProperties): Likewise.
* java/io/natFilePosix.cc (File::performList): Add
additional check for readdir_r on _POSIX_PTHREAD_SEMANTICS.
* java/util/natVMTimeZone.cc (VMTimeZone::getSystemTimeZoneId): Add
additional check for localtime_r on _POSIX_PTHREAD_SEMANTICS.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115864 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/natVMTimeZone.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/util/natVMTimeZone.cc b/libjava/java/util/natVMTimeZone.cc index a6d701642f6..d45ebf97853 100644 --- a/libjava/java/util/natVMTimeZone.cc +++ b/libjava/java/util/natVMTimeZone.cc @@ -1,6 +1,6 @@ // natVMTimeZone.cc -- Native side of VMTimeZone class. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation This file is part of libgcj. @@ -54,7 +54,7 @@ jstring java::util::VMTimeZone::getSystemTimeZoneId() { struct tm tim; -#ifndef HAVE_LOCALTIME_R +#if !defined(HAVE_LOCALTIME_R) || !defined(_POSIX_PTHREAD_SEMANTICS) struct tm *lt_tim; #endif #ifdef HAVE_TM_ZONE @@ -66,7 +66,7 @@ java::util::VMTimeZone::getSystemTimeZoneId() char *tzid; time(¤t_time); -#ifdef HAVE_LOCALTIME_R +#if defined(HAVE_LOCALTIME_R) && defined(_POSIX_PTHREAD_SEMANTICS) localtime_r(¤t_time, &tim); #else /* Fall back on non-thread safe localtime. */ |