r18277 - gnucash/trunk - Add win32 version of gmtime_r.
Phil Longstaff
plongstaff at code.gnucash.org
Sun Aug 23 22:00:39 EDT 2009
Author: plongstaff
Date: 2009-08-23 22:00:39 -0400 (Sun, 23 Aug 2009)
New Revision: 18277
Trac: http://svn.gnucash.org/trac/changeset/18277
Added:
gnucash/trunk/lib/libc/gmtime_r.c
gnucash/trunk/lib/libc/gmtime_r.h
Modified:
gnucash/trunk/configure.in
gnucash/trunk/lib/libc/Makefile.am
gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
Log:
Add win32 version of gmtime_r.
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2009-08-23 20:45:34 UTC (rev 18276)
+++ gnucash/trunk/configure.in 2009-08-24 02:00:39 UTC (rev 18277)
@@ -1367,7 +1367,7 @@
###-------------------------------------------------------------------------
AC_CHECK_FUNCS(pthread_mutex_init)
-AC_REPLACE_FUNCS(strptime localtime_r)
+AC_REPLACE_FUNCS(strptime localtime_r gmtime_r)
#AC_REPLACE_FUNCS(scm_strptime)
if test x$am_cv_val_LC_MESSAGES = "xno"; then
Modified: gnucash/trunk/lib/libc/Makefile.am
===================================================================
--- gnucash/trunk/lib/libc/Makefile.am 2009-08-23 20:45:34 UTC (rev 18276)
+++ gnucash/trunk/lib/libc/Makefile.am 2009-08-24 02:00:39 UTC (rev 18277)
@@ -2,12 +2,20 @@
# All header files must be listed.
noinst_HEADERS = \
- localtime_r.h setenv.h strptime.h pow.h
+ gmtime_r.h \
+ localtime_r.h \
+ setenv.h \
+ strptime.h \
+ pow.h
# No sources should be listed.
libc_missing_la_SOURCES = libc-missing-noop.c
-EXTRA_libc_missing_la_SOURCES = localtime_r.c setenv.c strptime.c
+EXTRA_libc_missing_la_SOURCES = \
+ gmtime_r.c \
+ localtime_r.c \
+ setenv.c \
+ strptime.c
# This will automatically be filled in with the necessary object file
# names. Configure does this based upon the AC_REPLACE_FUNCS macros.
Added: gnucash/trunk/lib/libc/gmtime_r.c
===================================================================
--- gnucash/trunk/lib/libc/gmtime_r.c (rev 0)
+++ gnucash/trunk/lib/libc/gmtime_r.c 2009-08-24 02:00:39 UTC (rev 18277)
@@ -0,0 +1,68 @@
+/********************************************************************
+ * File: gmtime_r.c
+ * Renamed from: core-utils.h
+ *
+ * Copyright (C) 2001 Linux Developers Group
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ ********************************************************************/
+
+#include "config.h"
+
+#if !HAVE_GMTIME_R
+#include <time.h>
+#include <string.h>
+#include "gmtime_r.h"
+
+#if HAVE_PTHREAD_MUTEX_INIT
+#include <pthread.h>
+struct tm *
+gmtime_r(const time_t *const timep, struct tm *p_tm)
+{
+ static pthread_mutex_t time_mutex;
+ static int time_mutex_inited = 0;
+ struct tm *tmp;
+
+ if (!time_mutex_inited) {
+ time_mutex_inited = 1;
+ pthread_mutex_init(&time_mutex, NULL);
+ }
+
+ pthread_mutex_lock(&time_mutex);
+ tmp = gmtime(timep);
+ if (tmp) {
+ memcpy(p_tm, tmp, sizeof(struct tm));
+ tmp = p_tm;
+ }
+ pthread_mutex_unlock(&time_mutex);
+
+ return tmp;
+}
+#else
+struct tm *
+gmtime_r(const time_t *const timep, struct tm *p_tm)
+{
+ static struct tm* tmp;
+ tmp = gmtime(timep);
+ if (tmp) {
+ memcpy(p_tm, tmp, sizeof(struct tm));
+ tmp = p_tm;
+ }
+ return tmp;
+}
+#endif /* HAVE_PTHREAD_MUTEX_INIT */
+
+#endif /* !HAVE_GMTIME_R */
Added: gnucash/trunk/lib/libc/gmtime_r.h
===================================================================
--- gnucash/trunk/lib/libc/gmtime_r.h (rev 0)
+++ gnucash/trunk/lib/libc/gmtime_r.h 2009-08-24 02:00:39 UTC (rev 18277)
@@ -0,0 +1,35 @@
+/********************************************************************
+ * File: gmtime_r.h
+ *
+ * Copyright (C) 2001 Linux Developers Group
+ * Copyright (C) 2009 Phil Longstaff <plongstaff at rogers.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ ********************************************************************/
+
+#ifndef __GMTIME_R_H__
+#define __GMTIME_R_H__
+
+#if !HAVE_GMTIME_R
+#include <time.h>
+/*
+ * Version of "gmtime_r()", for the benefit of OSes that don't have it.
+ */
+extern struct tm *gmtime_r(const time_t *const timep, struct tm *p_tm);
+#endif
+
+#endif
+
Modified: gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c
===================================================================
--- gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2009-08-23 20:45:34 UTC (rev 18276)
+++ gnucash/trunk/src/backend/dbi/gnc-backend-dbi.c 2009-08-24 02:00:39 UTC (rev 18277)
@@ -32,6 +32,9 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
+#if !HAVE_GMTIME_R
+#include "gmtime_r.h"
+#endif
#include <dbi/dbi.h>
More information about the gnucash-changes
mailing list