Attachment 49446 Details for Bug 39493 – Correct all OSX 10.7 build failures

[patch] Correct all OSX 10.7 build failures

cairo_lion.diff (text/plain), 1.68 KB, created by John Ralls on 2011-07-23 11:06:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Ralls

Created: 2011-07-23 11:06:17 UTC

Size: 1.68 KB

patch

obsolete

>diff --git a/perf/cairo-perf-report.c b/perf/cairo-perf-report.c
>index 8ab8090..a3d8bdb 100644
>--- a/perf/cairo-perf-report.c
>+++ b/perf/cairo-perf-report.c
>@@ -49,7 +49,7 @@
> typedef ptrdiff_t ssize_t;
> #endif
> 
>-#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8)
>+#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
> static ssize_t
> getline (char	**lineptr,
> 	 size_t  *n,
>@@ -234,7 +234,7 @@ test_report_parse (test_report_t *report,
>  * as needed. These aren't necessary full-fledged general purpose
>  * implementations. They just get the job done for our purposes.
>  */
>-#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8)
>+#if !defined (__USE_GNU) && !defined(__USE_XOPEN2K8) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
> #define POORMANS_GETLINE_BUFFER_SIZE (65536)
> static ssize_t
> getline (char	**lineptr,
>diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c
>index ff22882..b3a4679 100644
>--- a/perf/cairo-perf-trace.c
>+++ b/perf/cairo-perf-trace.c
>@@ -527,7 +527,7 @@ usage (const char *argv0)
> 	     argv0, argv0);
> }
> 
>-#ifndef __USE_GNU
>+#if !defined __USE_GNU  && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
> #define POORMANS_GETLINE_BUFFER_SIZE (65536)
> static ssize_t
> getline (char	**lineptr,
>diff --git a/src/cairo-quartz-font.c b/src/cairo-quartz-font.c
>index f529fc9..1e57c39 100644
>--- a/src/cairo-quartz-font.c
>+++ b/src/cairo-quartz-font.c
>@@ -802,7 +802,7 @@ _cairo_quartz_scaled_font_get_cg_font_ref (cairo_scaled_font_t *abstract_font)
>     return ffont->cgFont;
> }
> 
>-#ifndef __LP64__
>+#if !defined __LP64__ && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
> /*
>  * compat with old ATSUI backend
>  */

Actions: View | Splinter Review

Attachments on bug 39493: 49446 | 50961 | 50989 | 51316

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.