Skip to content

Commit 94e4625

Browse files
authored
fix build with libplist 2.3.0 (google#400)
* addresses recent plist_from_memory function signature change
1 parent 5ba30a2 commit 94e4625

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

configure.ac

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ AC_DEFINE_UNQUOTED([LIBIMOBILEDEVICE_VERSION], ["$libimobiledevice_version"], [
3838
AC_DEFINE_UNQUOTED([LIBPLIST_VERSION], ["$libplist_version"], [ ])
3939
AC_DEFINE_UNQUOTED([LIBUSBMUXD_VERSION], ["$libusbmuxd_version"], [ ])
4040

41+
[libplist_version_major=`expr "$libplist_version" : '\([0-9]*\)'`]
42+
[libplist_version_minor=`expr "$libplist_version" : '[0-9]*\.\([0-9]*\)'`]
43+
AC_DEFINE_UNQUOTED([LIBPLIST_VERSION_MAJOR], [$libplist_version_major], [ ])
44+
AC_DEFINE_UNQUOTED([LIBPLIST_VERSION_MINOR], [$libplist_version_minor], [ ])
45+
4146
# Checks for header files.
4247
AC_HEADER_STDC
4348
AC_HEADER_RESOLV

src/idevice_ext.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ int read_pair_record(const char *udid, plist_t *pair_record) {
3333
}
3434

3535
*pair_record = NULL;
36+
#if LIBPLIST_VERSION_MAJOR >= 2 && LIBPLIST_VERSION_MINOR >= 3
37+
plist_from_memory(record_data, record_size, pair_record, NULL);
38+
#else
3639
plist_from_memory(record_data, record_size, pair_record);
40+
#endif
3741
free(record_data);
3842

3943
if (!*pair_record) {

0 commit comments

Comments
 (0)