diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-11-16 10:57:55 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-11-19 17:27:13 +0100 |
| commit | 95f34420a5575b2d55e7aab588f37296b9edb47b (patch) | |
| tree | 1157a9dd76843d59f38d35d094864050dc833295 | |
| parent | ec8cacdc95e7173a09b13c3efaa7d91a7ee187a4 (diff) | |
| download | gstreamer-plugins-bad-95f34420a5575b2d55e7aab588f37296b9edb47b.tar.gz | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstglapi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 75d2d4ae9..4c30d9da0 100644 --- a/configure.ac +++ b/configure.ac @@ -827,7 +827,7 @@ if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then # if __APPLE__ # include <OpenGL/OpenGL.h> # include <OpenGL/gl.h> -# 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 <OpenGL/gl3.h> # endif diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index 798eeba6e..83b94a252 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -71,7 +71,7 @@ # ifdef __APPLE__ # include <OpenGL/OpenGL.h> # include <OpenGL/gl.h> -# 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 <OpenGL/gl3.h> # endif |