summaryrefslogtreecommitdiff
path: root/src/base/time.cc
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:49:40 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:49:40 -0500
commitfd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f (patch)
treece2a5d4e12142eab64231daab73953a15384b7c6 /src/base/time.cc
parent8561c8366c7c9afd7e6b52b6e2385b3c1dde95a9 (diff)
parent63fdabf191b8ac1031fb25da61ab2526d4bb6d05 (diff)
downloadgem5-fd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f.tar.xz
Merge zeep.pool:/z/saidi/work/m5.newmem
into zeep.pool:/z/saidi/work/m5.suncc --HG-- extra : convert_revision : 20f61a524a3b53fc0afcf53a24b5a1fe1d96f579
Diffstat (limited to 'src/base/time.cc')
-rw-r--r--src/base/time.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/base/time.cc b/src/base/time.cc
index cbc7256ee..76ba355b7 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -105,7 +105,11 @@ Time::date(string format) const
char buf[256];
if (format.empty()) {
+#ifdef __SUNPRO_CC
+ ctime_r(&sec, buf, 256);
+#else
ctime_r(&sec, buf);
+#endif
buf[24] = '\0';
return buf;
}