diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/io/natFilePosix.cc | 5 | ||||
| -rw-r--r-- | libjava/java/util/natVMTimeZone.cc | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libjava/java/io/natFilePosix.cc b/libjava/java/io/natFilePosix.cc index ff634b0..c9bf858 100644 --- a/libjava/java/io/natFilePosix.cc +++ b/libjava/java/io/natFilePosix.cc @@ -1,6 +1,7 @@ // natFile.cc - Native part of File class for POSIX. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 + Free Software Foundation This file is part of libgcj. @@ -288,7 +289,7 @@ java::io::File::performList (java::io::FilenameFilter *filter, java::util::ArrayList *list = new java::util::ArrayList (); struct dirent *d; -#ifdef HAVE_READDIR_R +#if defined(HAVE_READDIR_R) && defined(_POSIX_PTHREAD_SEMANTICS) int name_max = pathconf (buf, _PC_NAME_MAX); char dbuf[sizeof (struct dirent) + name_max + 1]; while (readdir_r (dir, (struct dirent *) dbuf, &d) == 0 && d != NULL) 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(¤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. */ |