lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-12-21 11:00:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix libmdbsql build on Windows

Browse Source
This commit is contained in:
Evan Miller
2020-12-17 11:04:54 -05:00
parent f6be7a74ef
commit e7d5125e2b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -36,7 +36,7 @@ AC_CHECK_DECLS([program_invocation_short_name], [], [], [[
dnl Checks for library functions. dnl Checks for library functions.
VL_LIB_READLINE VL_LIB_READLINE
AC_CHECK_FUNCS(strptime fmemopen) AC_CHECK_FUNCS(strptime fmemopen gmtime_r)
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST

9
src/sql/mdbsql.c
View File

@@ -763,9 +763,14 @@ int mdb_sql_find_sargcol(MdbSargNode *node, gpointer data)
* Plain integers are UNIX timestamps for backwards compatibility of parser * Plain integers are UNIX timestamps for backwards compatibility of parser
*/ */
if (col->col_type == MDB_DATETIME && node->val_type == MDB_INT) { if (col->col_type == MDB_DATETIME && node->val_type == MDB_INT) {
struct tm *tmp;
#ifdef HAVE_GMTIME_R
struct tm tm; struct tm tm;
gmtime_r((time_t*)&node->value.i, &tm); tmp = gmtime_r((time_t*)&node->value.i, &tm);
mdb_tm_to_date(&tm, &node->value.d); #else // regular gmtime on Windows uses thread-local storage
tmp = gmtime((time_t*)&node->value.i);
#endif
mdb_tm_to_date(tmp, &node->value.d);
node->val_type = MDB_DOUBLE; node->val_type = MDB_DOUBLE;
} }
} }