Module: wine Branch: master Commit: 650b6a9fc4081ba15cdca751af6e5cf2513b7cca URL: https://gitlab.winehq.org/wine/wine/-/commit/650b6a9fc4081ba15cdca751af6e5cf...
Author: Brendan Shanks bshanks@codeweavers.com Date: Tue Nov 22 13:27:56 2022 -0800
configure: Remove ApplicationServices.framework check (always present on macOS).
---
configure | 6 ------ configure.ac | 1 - dlls/winspool.drv/cups.c | 4 ++-- include/config.h.in | 4 ---- 4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/configure b/configure index de1ca2c9692..c92683ffaa5 100755 --- a/configure +++ b/configure @@ -7843,12 +7843,6 @@ if test "x$ac_cv_header_AL_al_h" = xyes then : printf "%s\n" "#define HAVE_AL_AL_H 1" >>confdefs.h
-fi -ac_fn_c_check_header_compile "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" -if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes -then : - printf "%s\n" "#define HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "CL/cl.h" "ac_cv_header_CL_cl_h" "$ac_includes_default" if test "x$ac_cv_header_CL_cl_h" = xyes diff --git a/configure.ac b/configure.ac index d9d112fa2a4..c057b318f2b 100644 --- a/configure.ac +++ b/configure.ac @@ -407,7 +407,6 @@ AC_SYS_LARGEFILE()
AC_CHECK_HEADERS(\ AL/al.h \ - ApplicationServices/ApplicationServices.h \ CL/cl.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index ccb64325e7b..1034277aad6 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -41,7 +41,7 @@ #include <cups/ppd.h> #endif
-#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#ifdef __APPLE__ #define GetCurrentProcess GetCurrentProcess_Mac #define GetCurrentThread GetCurrentThread_Mac #define LoadResource LoadResource_Mac @@ -386,7 +386,7 @@ static NTSTATUS get_ppd( void *args )
static NTSTATUS get_default_page_size( void *args ) { -#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#ifdef __APPLE__ const struct get_default_page_size_params *params = args; NTSTATUS status = STATUS_UNSUCCESSFUL; PMPrintSession session = NULL; diff --git a/include/config.h.in b/include/config.h.in index 509dd2869bf..2c62db978bc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -9,10 +9,6 @@ /* Define to 1 if you have the <AL/al.h> header file. */ #undef HAVE_AL_AL_H
-/* Define to 1 if you have the <ApplicationServices/ApplicationServices.h> - header file. */ -#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H