lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-07-16 23:32:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Require glib2 2.68 or later (for g_memdup2) (#400)

Browse Source
This commit is contained in:
Evan Miller 2022-12-17 07:08:44 -05:00 committed by GitHub
parent f14fbea093
commit f7ae5e3f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -125,7 +125,7 @@ jobs:
base-devel base-devel
gcc gcc
git git
glib2 glib2-devel
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Check out test data - name: Check out test data
run: git clone https://github.com/mdbtools/mdbtestdata.git test run: git clone https://github.com/mdbtools/mdbtestdata.git test

3
configure.ac
View File

@ -226,10 +226,9 @@ AC_ARG_ENABLE(glib,
if test "$enable_glib" = "yes"; then if test "$enable_glib" = "yes"; then
GLIB_PACKAGE=glib-2.0 GLIB_PACKAGE=glib-2.0
PKG_CHECK_MODULES([GLIB], [$GLIB_PACKAGE], HAVE_GLIB=true, HAVE_GLIB=false) PKG_CHECK_MODULES([GLIB], [$GLIB_PACKAGE >= 2.68], HAVE_GLIB=true, HAVE_GLIB=false)
if test "x$HAVE_GLIB" = "xtrue"; then if test "x$HAVE_GLIB" = "xtrue"; then
GLIB_CFLAGS="$GLIB_CFLAGS -DHAVE_GLIB=1" GLIB_CFLAGS="$GLIB_CFLAGS -DHAVE_GLIB=1"
AC_CHECK_LIB($GLIB_PACKAGE, g_memdup2, [GLIB_CFLAGS="$GLIB_CFLAGS -DHAVE_G_MEMDUP2=1"])
AC_SUBST(GLIB_PACKAGE) AC_SUBST(GLIB_PACKAGE)
else else
enable_glib=no enable_glib=no

1
include/mdbfakeglib.h
View File

@ -117,6 +117,7 @@ typedef struct GOptionContext {
#define g_malloc malloc #define g_malloc malloc
#define g_free free #define g_free free
#define g_realloc realloc #define g_realloc realloc
#define g_memdup2 g_memdup
#define G_STR_DELIMITERS "_-|> <." #define G_STR_DELIMITERS "_-|> <."

4
include/mdbprivate.h
View File

@ -26,10 +26,6 @@
* used within mdbtools so they won't be exported to calling programs. * used within mdbtools so they won't be exported to calling programs.
*/ */
#ifndef HAVE_G_MEMDUP2
#define g_memdup2 g_memdup
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif