From 3ad1669b2e828bbafcddfd1368b6c8ac5ee968d1 Mon Sep 17 00:00:00 2001
From: Evan Miller <emmiller@gmail.com>
Date: Fri, 20 Aug 2021 07:20:50 -0400
Subject: [PATCH] Restore previous MdbHandle struct layout

---
 configure.ac          | 15 ++++-----------
 include/mdbtools.h.in | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5b4dada..4ca1c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,21 +220,14 @@ AM_CONDITIONAL(FAKE_GLIB, test "x$enable_glib" != "xyes")
 
 dnl Set up substitution variables
 if test "$am_cv_func_iconv" = "yes"; then
-    ICONV_INCLUDE_HEADER=iconv.h
-    ICONV_TYPE=iconv_t
-else
-    ICONV_INCLUDE_HEADER=stdbool.h
-    ICONV_TYPE=[void *]
+    HAVE_ICONV=1
 fi
-AC_SUBST(ICONV_INCLUDE_HEADER)
-AC_SUBST(ICONV_TYPE)
+AC_SUBST(HAVE_ICONV)
 
 if test "$ac_cv_header_xlocale_h" = "yes"; then
-    XLOCALE_INCLUDE_HEADER=xlocale.h
-else
-    XLOCALE_INCLUDE_HEADER=stdbool.h
+    HAVE_XLOCALE_H=1
 fi
-AC_SUBST(XLOCALE_INCLUDE_HEADER)
+AC_SUBST(HAVE_XLOCALE_H)
 
 if test "$enable_glib" = "yes"; then
     GLIB_INCLUDE_HEADER=glib.h
diff --git a/include/mdbtools.h.in b/include/mdbtools.h.in
index fd755b8..2d4ef2d 100644
--- a/include/mdbtools.h.in
+++ b/include/mdbtools.h.in
@@ -18,6 +18,9 @@
 #ifndef _mdbtools_h_
 #define _mdbtools_h_
 
+#define MDBTOOLS_H_HAVE_ICONV @HAVE_ICONV@
+#define MDBTOOLS_H_HAVE_XLOCALE_H @HAVE_XLOCALE_H@
+
 #ifdef __cplusplus
   extern "C" {
 #endif
@@ -31,10 +34,14 @@
 #include <ctype.h>
 #include <string.h>
 #include <locale.h>
-#include <@ICONV_INCLUDE_HEADER@>
-#include <@XLOCALE_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
 #include <io.h>
 #endif
@@ -299,9 +306,10 @@ typedef struct {
 	char        *relationships_values[5];
 	MdbStatistics *stats;
     GHashTable *backends;
-	@ICONV_TYPE@ iconv_in;
-	@ICONV_TYPE@ iconv_out;
-#if defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(WIN64) || defined(WINDOWS)
+#if MDBTOOLS_H_HAVE_ICONV
+	iconv_t iconv_in;
+	iconv_t iconv_out;
+#elif defined(_WIN32) || defined(WIN32) || defined(_WIN64) || defined(WIN64) || defined(WINDOWS)
     _locale_t locale;
 #else
     locale_t locale;