From 9bc95a0c307e7614cc3d10671d6c1c90c3ac0a9f Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Wed, 27 Nov 2024 12:56:02 +0100 Subject: Fix compilation on MSVC --- common/userpref.c | 12 ++++++------ include/libimobiledevice/libimobiledevice.h | 7 +++++-- src/afc.c | 7 +++++-- src/house_arrest.c | 4 ++++ src/installation_proxy.c | 6 +++++- src/lockdown-cu.c | 4 ++++ src/lockdown.c | 4 ++++ src/misagent.c | 6 +++++- src/mobile_image_mounter.c | 4 ++++ src/notification_proxy.c | 6 +++++- src/sbservices.c | 4 ++++ 11 files changed, 51 insertions(+), 13 deletions(-) diff --git a/common/userpref.c b/common/userpref.c index 9c2c563..08ab7e2 100644 --- a/common/userpref.c +++ b/common/userpref.c @@ -29,13 +29,18 @@ #include #include #include +#include + #ifdef HAVE_SYS_TYPES_H #include #endif +#include #ifndef _WIN32 #include -#endif #include +#include +#include +#endif #include #if defined(HAVE_OPENSSL) #include @@ -64,11 +69,6 @@ #error No supported TLS/SSL library enabled #endif -#include -#include -#include -#include - #ifdef _WIN32 #include #endif diff --git a/include/libimobiledevice/libimobiledevice.h b/include/libimobiledevice/libimobiledevice.h index a9d270b..897aa37 100644 --- a/include/libimobiledevice/libimobiledevice.h +++ b/include/libimobiledevice/libimobiledevice.h @@ -31,10 +31,13 @@ extern "C" { #endif #include -#include -#include #include +#if defined(_MSC_VER) +#include +typedef SSIZE_T ssize_t; +#endif + #ifndef LIBIMOBILEDEVICE_API #ifdef LIBIMOBILEDEVICE_STATIC #define LIBIMOBILEDEVICE_API diff --git a/src/afc.c b/src/afc.c index d9b35b7..c0314bc 100644 --- a/src/afc.c +++ b/src/afc.c @@ -26,9 +26,12 @@ #endif #include #include -#include #include +#ifndef _MSC_VER +#include +#endif + #include "idevice.h" #include "afc.h" #include "common/debug.h" @@ -115,7 +118,7 @@ afc_error_t afc_client_new(idevice_t device, lockdownd_service_descriptor_t serv afc_error_t afc_client_start_service(idevice_t device, afc_client_t * client, const char* label) { - afc_error_t err = AFC_E_UNKNOWN_ERROR; + int32_t err = AFC_E_UNKNOWN_ERROR; service_client_factory_start_service(device, AFC_SERVICE_NAME, (void**)client, label, SERVICE_CONSTRUCTOR(afc_client_new), &err); return err; } diff --git a/src/house_arrest.c b/src/house_arrest.c index caad731..06068c6 100644 --- a/src/house_arrest.c +++ b/src/house_arrest.c @@ -24,7 +24,11 @@ #endif #include #include + +#ifndef _MSC_VER #include +#endif + #include #include "house_arrest.h" diff --git a/src/installation_proxy.c b/src/installation_proxy.c index ec19da0..bb6ef01 100644 --- a/src/installation_proxy.c +++ b/src/installation_proxy.c @@ -26,7 +26,11 @@ #include #include #include + +#ifndef _MSC_VER #include +#endif + #include #include "installation_proxy.h" @@ -251,7 +255,7 @@ instproxy_error_t instproxy_client_new(idevice_t device, lockdownd_service_descr instproxy_error_t instproxy_client_start_service(idevice_t device, instproxy_client_t * client, const char* label) { - instproxy_error_t err = INSTPROXY_E_UNKNOWN_ERROR; + int32_t err = INSTPROXY_E_UNKNOWN_ERROR; service_client_factory_start_service(device, INSTPROXY_SERVICE_NAME, (void**)client, label, SERVICE_CONSTRUCTOR(instproxy_client_new), &err); return err; } diff --git a/src/lockdown-cu.c b/src/lockdown-cu.c index e0af5e2..9fbd2c8 100644 --- a/src/lockdown-cu.c +++ b/src/lockdown-cu.c @@ -29,7 +29,11 @@ #define __USE_GNU 1 #include #include + +#ifndef _MSC_VER #include +#endif + #include #include "idevice.h" diff --git a/src/lockdown.c b/src/lockdown.c index be55934..3679fee 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -32,7 +32,11 @@ #define __USE_GNU 1 #include #include + +#ifndef _MSC_VER #include +#endif + #include #include diff --git a/src/misagent.c b/src/misagent.c index e3da997..3fdca4d 100644 --- a/src/misagent.c +++ b/src/misagent.c @@ -24,9 +24,13 @@ #endif #include #include +#include + +#ifndef _MSC_VER #include +#endif + #include -#include #include "misagent.h" #include "property_list_service.h" diff --git a/src/mobile_image_mounter.c b/src/mobile_image_mounter.c index 6df50c4..6677882 100644 --- a/src/mobile_image_mounter.c +++ b/src/mobile_image_mounter.c @@ -24,7 +24,11 @@ #endif #include #include + +#ifndef _MSC_VER #include +#endif + #include #include "mobile_image_mounter.h" diff --git a/src/notification_proxy.c b/src/notification_proxy.c index 9d983ba..c7e4660 100644 --- a/src/notification_proxy.c +++ b/src/notification_proxy.c @@ -24,7 +24,11 @@ #endif #include #include + +#ifndef _MSC_VER #include +#endif + #include #include "notification_proxy.h" @@ -110,7 +114,7 @@ np_error_t np_client_new(idevice_t device, lockdownd_service_descriptor_t servic np_error_t np_client_start_service(idevice_t device, np_client_t* client, const char* label) { - np_error_t err = NP_E_UNKNOWN_ERROR; + int32_t err = NP_E_UNKNOWN_ERROR; service_client_factory_start_service(device, NP_SERVICE_NAME, (void**)client, label, SERVICE_CONSTRUCTOR(np_client_new), &err); return err; } diff --git a/src/sbservices.c b/src/sbservices.c index 365e130..5df5122 100644 --- a/src/sbservices.c +++ b/src/sbservices.c @@ -24,7 +24,11 @@ #endif #include #include + +#ifndef _MSC_VER #include +#endif + #include #include "sbservices.h" -- cgit v1.1-32-gdbae