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

Restore previous MdbHandle struct layout

Browse Source
This commit is contained in:
Evan Miller 2021-08-20 07:20:50 -04:00
parent 05d1b373d5
commit 3ad1669b2e
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -220,21 +220,14 @@ AM_CONDITIONAL(FAKE_GLIB, test "x$enable_glib" != "xyes")
dnl Set up substitution variables dnl Set up substitution variables
if test "$am_cv_func_iconv" = "yes"; then if test "$am_cv_func_iconv" = "yes"; then
ICONV_INCLUDE_HEADER=iconv.h HAVE_ICONV=1
ICONV_TYPE=iconv_t
else
ICONV_INCLUDE_HEADER=stdbool.h
ICONV_TYPE=[void *]
fi fi
AC_SUBST(ICONV_INCLUDE_HEADER) AC_SUBST(HAVE_ICONV)
AC_SUBST(ICONV_TYPE)
if test "$ac_cv_header_xlocale_h" = "yes"; then if test "$ac_cv_header_xlocale_h" = "yes"; then
XLOCALE_INCLUDE_HEADER=xlocale.h HAVE_XLOCALE_H=1
else
XLOCALE_INCLUDE_HEADER=stdbool.h
fi fi
AC_SUBST(XLOCALE_INCLUDE_HEADER) AC_SUBST(HAVE_XLOCALE_H)
if test "$enable_glib" = "yes"; then if test "$enable_glib" = "yes"; then
GLIB_INCLUDE_HEADER=glib.h GLIB_INCLUDE_HEADER=glib.h

18
include/mdbtools.h.in
View File

@ -18,6 +18,9 @@
#ifndef _mdbtools_h_ #ifndef _mdbtools_h_
#define _mdbtools_h_ #define _mdbtools_h_
#define MDBTOOLS_H_HAVE_ICONV @HAVE_ICONV@
#define MDBTOOLS_H_HAVE_XLOCALE_H @HAVE_XLOCALE_H@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -31,10 +34,14 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <locale.h> #include <locale.h>
#include <@ICONV_INCLUDE_HEADER@>
#include <@XLOCALE_INCLUDE_HEADER@>
#include <@GLIB_INCLUDE_HEADER@> #include <@GLIB_INCLUDE_HEADER@>
#if MDBTOOLS_H_HAVE_ICONV
#include <iconv.h>
#elif MDBTOOLS_H_HAVE_XLOCALE_H
#include <xlocale.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> #include <io.h>
#endif #endif
@ -299,9 +306,10 @@ typedef struct {
char *relationships_values[5]; char *relationships_values[5];
MdbStatistics *stats; MdbStatistics *stats;
GHashTable *backends; GHashTable *backends;
@ICONV_TYPE@ iconv_in; #if MDBTOOLS_H_HAVE_ICONV
@ICONV_TYPE@ iconv_out; iconv_t iconv_in;
#if defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(WIN64) || defined(WINDOWS) iconv_t iconv_out;
#elif defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(WIN64) || defined(WINDOWS)
_locale_t locale; _locale_t locale;
#else #else
locale_t locale; locale_t locale;