From dfc22ebcb9ff29c08766f881f76a430924e31d74 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Tue, 16 May 2006 16:18:49 +0000
Subject: [PATCH] revert r14081 because we always have localtime_r.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14083 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                 |  5 +++
 lib/libqof/qof/gnc-date.c | 72 +++++++++------------------------------
 2 files changed, 21 insertions(+), 56 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83e5eabbe6..c6e08c6ff4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Derek Atkins  <derek@ihtfp.com>
+
+	* lib/libqof/qof/gnc-date.c:
+	  revert r14081 because we always have localtime_r.
+
 2006-05-16  Christian Stimming <stimming@tuhh.de>
 
 	* lib/libqof/qof/gnc-date.c (timespecCanonicalDayTime)
diff --git a/lib/libqof/qof/gnc-date.c b/lib/libqof/qof/gnc-date.c
index 45041a18cc..b804bea50b 100644
--- a/lib/libqof/qof/gnc-date.c
+++ b/lib/libqof/qof/gnc-date.c
@@ -249,17 +249,9 @@ Timespec
 timespecCanonicalDayTime(Timespec t)
 {
   struct tm tm;
-#ifndef HAVE_LOCALTIME_R
-  struct tm *result;
-#endif
   Timespec retval;
   time_t t_secs = t.tv_sec + (t.tv_nsec / NANOS_PER_SECOND);
-#ifndef HAVE_LOCALTIME_R
-  result = localtime(&t_secs);
-  tm = *result;
-#else
   localtime_r(&t_secs, &tm);
-#endif
   gnc_tm_set_day_middle(&tm);
   retval.tv_sec = mktime(&tm);
   retval.tv_nsec = 0;
@@ -503,24 +495,16 @@ qof_print_date_dmy_buff (char * buff, size_t len, int day, int month, int year)
 size_t
 qof_print_date_buff (char * buff, size_t len, time_t t)
 {
-#ifdef HAVE_LOCALTIME_R
-  struct tm theTime_tm; 
-#endif
-  struct tm *theTime;
+  struct tm theTime;
 
   if (!buff) return 0 ;
 
-#ifdef HAVE_LOCALTIME_R
-  localtime_r (&t, &theTime_tm);
-  theTime = &theTime_tm;
-#else
-  theTime = localtime (&t);
-#endif
+  localtime_r(&t, &theTime);
 
   return qof_print_date_dmy_buff (buff, len,
-                   theTime->tm_mday, 
-                   theTime->tm_mon + 1,
-                   theTime->tm_year + 1900);
+                   theTime.tm_mday, 
+                   theTime.tm_mon + 1,
+                   theTime.tm_year + 1900);
 }
 
 size_t
@@ -954,21 +938,13 @@ char dateSeparator (void)
       else
       { /* Make a guess */
         unsigned char string[256];
-        struct tm *tm;
-#ifdef HAVE_LOCALTIME_R
-	struct tm struct_tm;
-#endif
+        struct tm tm;
         time_t secs;
         unsigned char *s;
 
         secs = time(NULL);
-#ifdef HAVE_LOCALTIME_R
-	localtime_r(&secs, &struct_tm);
-	tm = &struct_tm;
-#else
-        tm = localtime(&secs);
-#endif
-        strftime(string, sizeof(string), GNC_D_FMT, tm);
+        localtime_r(&secs, &tm);
+        strftime(string, sizeof(string), GNC_D_FMT, &tm);
 
         for (s = string; s != '\0'; s++)
           if (!isdigit(*s))
@@ -1214,38 +1190,22 @@ gnc_timespec_to_iso8601_buff (Timespec ts, char * buff)
 int
 gnc_timespec_last_mday (Timespec t)
 {
-#ifdef HAVE_LOCALTIME_R
-  struct tm tm;
-#endif
-  struct tm *result;
+  struct tm result;
   time_t t_secs = t.tv_sec + (t.tv_nsec / NANOS_PER_SECOND);
-#ifdef HAVE_LOCALTIME_R
-  localtime_r(&t_secs, &tm);
-  result = &tm;
-#else
-  result = localtime(&t_secs);
-#endif
-  return date_get_last_mday (result);
+  localtime_r(&t_secs, &result);
+  return date_get_last_mday (&result);
 }
 
 void
 gnc_timespec2dmy (Timespec t, int *day, int *month, int *year)
 {
-#ifdef HAVE_LOCALTIME_R
-  struct tm tm;
-#endif
-  struct tm *result;
+  struct tm result;
   time_t t_secs = t.tv_sec + (t.tv_nsec / NANOS_PER_SECOND);
-#ifdef HAVE_LOCALTIME_R
-  localtime_r(&t_secs, &tm);
-  result = &tm;
-#else
-  result = localtime(&t_secs);
-#endif
+  localtime_r(&t_secs, &result);
 
-  if (day) *day = result->tm_mday;
-  if (month) *month = result->tm_mon+1;
-  if (year) *year = result->tm_year+1900;
+  if (day) *day = result.tm_mday;
+  if (month) *month = result.tm_mon+1;
+  if (year) *year = result.tm_year+1900;
 }
 
 /********************************************************************\