diff options
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/natDate.cc | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/libjava/java/util/natDate.cc b/libjava/java/util/natDate.cc index 27f91f6..563f8c0 100644 --- a/libjava/java/util/natDate.cc +++ b/libjava/java/util/natDate.cc @@ -28,13 +28,35 @@ details. */ #include <sys/time.h> #endif +#if HAVE_CTIME_R +/* Use overload resolution to find out the signature of ctime_r. */ + + /* This is Posix ctime_r(). */ +template <typename T_clock, typename T_buf, size_t buflen> +static inline char * +ctime_adaptor (char* (*ctime_r)(T_clock *clock, T_buf *buf), + time_t *clock, char (&buf)[buflen]) +{ + return ctime_r(clock, buf); +} + +/* This is an old-style ctime_r, used on IRIX 5.2. */ +template <typename T_clock, typename T_buf, typename T_buflen, size_t buflen> +static inline char * +ctime_adaptor (char* (*ctime_r)(T_clock *clock, T_buf *buf, T_buflen len), + time_t *clock, char (&buf)[buflen]) +{ + return ctime_r(clock, buf, buflen); +} +#endif + jstring java::util::Date::toString() { #ifdef HAVE_CTIME_R time_t t = millis / 1000; char buf[30]; - return JvNewStringLatin1 (ctime_r (&t, buf)); + return JvNewStringLatin1 (ctime_adaptor (ctime_r, &t, buf)); #elif defined (HAVE_CTIME) // FIXME: this isn't thread-safe. time_t t = millis / 1000; |