luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Win32 build

Browse Source
This commit is contained in:
Tor Lillqvist 2010-08-26 12:41:46 +03:00
parent ca26f9a502
commit 3c86a77ae5
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -882,6 +882,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f
#endif]) #endif])
# struct statvfs.f_basetype is available on Solaris but not for Linux. # struct statvfs.f_basetype is available on Solaris but not for Linux.
AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [#include <sys/statvfs.h>]) AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [#include <sys/statvfs.h>])
AC_CHECK_MEMBERS([struct tm.tm_gmtoff])
# Checks for libcharset # Checks for libcharset
AM_LANGINFO_CODESET AM_LANGINFO_CODESET

2
glib/gdatetime.c
View File

@ -1700,7 +1700,7 @@ g_date_time_new_from_epoch (gint64 t) /* IN */
localtime_r (&tt, &tm); localtime_r (&tt, &tm);
#else #else
{ {
struct tm *ptm = localtime (&timet); struct tm *ptm = localtime (&tt);
if (ptm == NULL) if (ptm == NULL)
{ {

26
glib/tests/gdatetime.c
View File

@ -54,9 +54,9 @@ get_localtime_tm (time_t time_,
g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, "ptm != NULL"); g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, "ptm != NULL");
#endif #endif
tm.tm_mon = 0; retval->tm_mon = 0;
tm.tm_mday = 1; retval->tm_mday = 1;
tm.tm_year = 100; retval->tm_year = 100;
} }
else else
memcpy ((void *) retval, (void *) ptm, sizeof (struct tm)); memcpy ((void *) retval, (void *) ptm, sizeof (struct tm));
@ -718,7 +718,18 @@ test_GDateTime_utc_now (void)
struct tm tm; struct tm tm;
t = time (NULL); t = time (NULL);
#ifdef HAVE_GMTIME_R
gmtime_r (&t, &tm); gmtime_r (&t, &tm);
#else
{
struct tm *tmp = gmtime (&t);
/* Assume gmtime() can't fail as we got t from time(NULL). (Note
* that on Windows, gmtime() *is* MT-safe, it uses a thread-local
* buffer.)
*/
memcpy (&tm, tmp, sizeof (struct tm));
}
#endif
dt = g_date_time_new_utc_now (); dt = g_date_time_new_utc_now ();
g_assert_cmpint (tm.tm_year + 1900, ==, g_date_time_get_year (dt)); g_assert_cmpint (tm.tm_year + 1900, ==, g_date_time_get_year (dt));
g_assert_cmpint (tm.tm_mon + 1, ==, g_date_time_get_month (dt)); g_assert_cmpint (tm.tm_mon + 1, ==, g_date_time_get_month (dt));
@ -741,7 +752,9 @@ test_GDateTime_get_utc_offset (void)
dt = g_date_time_new_now (); dt = g_date_time_new_now ();
ts = g_date_time_get_utc_offset (dt); ts = g_date_time_get_utc_offset (dt);
#ifdef HAVE_STRUCT_TM_TM_GMTOFF
g_assert_cmpint (ts, ==, (tm.tm_gmtoff * G_TIME_SPAN_SECOND)); g_assert_cmpint (ts, ==, (tm.tm_gmtoff * G_TIME_SPAN_SECOND));
#endif
g_date_time_unref (dt); g_date_time_unref (dt);
} }
@ -791,7 +804,14 @@ test_GDateTime_to_utc (void)
struct tm tm; struct tm tm;
t = time (NULL); t = time (NULL);
#ifdef HAVE_GMTIME_R
gmtime_r (&t, &tm); gmtime_r (&t, &tm);
#else
{
struct tm *tmp = gmtime (&t);
memcpy (&tm, tmp, sizeof (struct tm));
}
#endif
dt2 = g_date_time_new_now (); dt2 = g_date_time_new_now ();
dt = g_date_time_to_utc (dt2); dt = g_date_time_to_utc (dt2);
g_assert_cmpint (tm.tm_year + 1900, ==, g_date_time_get_year (dt)); g_assert_cmpint (tm.tm_year + 1900, ==, g_date_time_get_year (dt));