From 51a07571fbcc6aeb4128e6ca8bde2f0a1a64d2f9 Mon Sep 17 00:00:00 2001 From: artygus Date: Sat, 20 May 2023 10:08:49 +0100 Subject: [PATCH] fix build with libplist 2.3.0 --- configure.ac | 5 +++++ src/idevice_ext.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index ac2a278d..2ede314d 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,11 @@ AC_DEFINE_UNQUOTED([LIBIMOBILEDEVICE_VERSION], ["$libimobiledevice_version"], [ AC_DEFINE_UNQUOTED([LIBPLIST_VERSION], ["$libplist_version"], [ ]) AC_DEFINE_UNQUOTED([LIBUSBMUXD_VERSION], ["$libusbmuxd_version"], [ ]) +[libplist_version_major=`expr "$libplist_version" : '\([0-9]*\)'`] +[libplist_version_minor=`expr "$libplist_version" : '[0-9]*\.\([0-9]*\)'`] +AC_DEFINE_UNQUOTED([LIBPLIST_VERSION_MAJOR], [$libplist_version_major], [ ]) +AC_DEFINE_UNQUOTED([LIBPLIST_VERSION_MINOR], [$libplist_version_minor], [ ]) + # Checks for header files. AC_HEADER_STDC AC_HEADER_RESOLV diff --git a/src/idevice_ext.c b/src/idevice_ext.c index 22b85d1a..321a9957 100644 --- a/src/idevice_ext.c +++ b/src/idevice_ext.c @@ -33,7 +33,11 @@ int read_pair_record(const char *udid, plist_t *pair_record) { } *pair_record = NULL; +#if LIBPLIST_VERSION_MAJOR >= 2 && LIBPLIST_VERSION_MINOR >= 3 + plist_from_memory(record_data, record_size, pair_record, NULL); +#else plist_from_memory(record_data, record_size, pair_record); +#endif free(record_data); if (!*pair_record) {