Merge with head.

[gem5.git] / src / base / time.cc

diff --git a/src/base/time.cc b/src/base/time.cc
index 5827c9a858733cc6b58a668391bf89a429a4c2d7..76ba355b78617253ae07ceb21088a6166187ac8e 100644 (file)
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
  */
 
 #include <sys/types.h>
@@ -103,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;
     }