winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK.

The cupsGetPPD() function was moved there from <cups/cups.h> because it's
deprecated.

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ken Thomases 2016-06-27 15:34:07 -05:00 committed by Alexandre Julliard
parent f6a00dbd25
commit 10065d2acd
4 changed files with 20 additions and 1 deletions

12
configure vendored
View File

@ -13054,6 +13054,18 @@ _ACEOF
CUPS_CFLAGS="$ac_cups_cflags"
fi
for ac_header in cups/ppd.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default"
if test "x$ac_cv_header_cups_ppd_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_CUPS_PPD_H 1
_ACEOF
fi
done
fi
done

View File

@ -1543,7 +1543,8 @@ then
AC_CHECK_HEADERS(cups/cups.h,
[WINE_CHECK_SONAME(cups,cupsGetDefault,
[CUPS_CFLAGS="$ac_cups_cflags"],,
[$ac_cups_libs])])
[$ac_cups_libs])
AC_CHECK_HEADERS(cups/ppd.h)])
CPPFLAGS="$ac_save_CPPFLAGS"
fi
WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"],

View File

@ -44,6 +44,9 @@
#ifdef HAVE_CUPS_CUPS_H
# include <cups/cups.h>
#endif
#ifdef HAVE_CUPS_PPD_H
# include <cups/ppd.h>
#endif
#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
#define GetCurrentProcess GetCurrentProcess_Mac

View File

@ -89,6 +89,9 @@
/* Define to 1 if you have the <cups/cups.h> header file. */
#undef HAVE_CUPS_CUPS_H
/* Define to 1 if you have the <cups/ppd.h> header file. */
#undef HAVE_CUPS_PPD_H
/* Define to 1 if you have the <curses.h> header file. */
#undef HAVE_CURSES_H