aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/util
diff options
context:
space:
mode:
authorAndreas Tobler <a.tobler@schweiz.ch>2006-08-01 22:59:24 +0200
committerAndreas Tobler <andreast@gcc.gnu.org>2006-08-01 22:59:24 +0200
commitd2b815074b745370cc5ebb541dcf41b52ea8c648 (patch)
tree6cff204b32d7948ab8b445aab320aab3819ec115 /libjava/java/util
parent9beafc83cabd13b4ad5783209db8f32998363e08 (diff)
downloadgcc-d2b815074b745370cc5ebb541dcf41b52ea8c648.zip
gcc-d2b815074b745370cc5ebb541dcf41b52ea8c648.tar.gz
gcc-d2b815074b745370cc5ebb541dcf41b52ea8c648.tar.bz2
natSystemProperties.cc: Add additional check for getpwuid_r on _POSIX_PTHREAD_SEMANTICS.
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. From-SVN: r115864
Diffstat (limited to 'libjava/java/util')
-rw-r--r--libjava/java/util/natVMTimeZone.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/util/natVMTimeZone.cc b/libjava/java/util/natVMTimeZone.cc
index a6d7016..d45ebf9 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(&current_time);
-#ifdef HAVE_LOCALTIME_R
+#if defined(HAVE_LOCALTIME_R) && defined(_POSIX_PTHREAD_SEMANTICS)
localtime_r(&current_time, &tim);
#else
/* Fall back on non-thread safe localtime. */