From 9492db96d18d89ee140f969c901e5287c1af429b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 16 Nov 2014 10:57:55 +0100 Subject: [PATCH] gl: Use numeric OSX version instead of the macro The macro is not defined on older OSX versions and evaluates to 0. https://bugzilla.gnome.org/show_bug.cgi?id=740201 --- configure.ac | 2 +- gst-libs/gst/gl/gstglapi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 120cd44..2739b55 100644 --- a/configure.ac +++ b/configure.ac @@ -833,7 +833,7 @@ if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLU" = "xyes" -a "x$HAVE_GLES2" = "xyes" # if __APPLE__ # include # include -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 +# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 # define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED # include # endif diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index d46a5f5..11e9f3a 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -70,7 +70,7 @@ # ifdef __APPLE__ # include # include -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 +# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 # define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED # include # endif -- 2.7.4