projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ed379c)
Use value instead of version macro when testing for mac OS version
authorJérôme Laheurte <jerome@jeromelaheurte.net>
Sun, 1 Oct 2017 17:04:15 +0000 (19:04 +0200)
committerTim-Philipp Müller <tim@centricular.com>
Sat, 9 Dec 2017 19:32:30 +0000 (19:32 +0000)
https://bugzilla.gnome.org/show_bug.cgi?id=788404

gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m patch | blob | history
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m patch | blob | history
tests/examples/gl/cocoa/cocoa-videooverlay.m patch | blob | history

diff --git a/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m b/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m
index d76b766121a610d54f442c814923998af95fb055..5b9205b454f2d1825a51812e56e5b2a63f312bc6 100644 (file)
--- a/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m
+++ b/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m
@@ -34,7 +34,7 @@ G_DEFINE_TYPE (GstGLDisplayCocoa, gst_gl_display_cocoa, GST_TYPE_GL_DISPLAY);
 static void gst_gl_display_cocoa_finalize (GObject * object);
 static guintptr gst_gl_display_cocoa_get_handle (GstGLDisplay * display);
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
 #define NSEventMaskAny                       NSAnyEventMask
 #endif
 
diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
index b13f1de7116e88aa870ae66b080e9c9076847e31..4b2eb605d9694f9f32ed9aea14580d3f5f2f8b75 100644 (file)
--- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
+++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
@@ -28,7 +28,7 @@
 
 #include "gstgl_cocoa_private.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
 #define NSWindowStyleMaskTitled              NSTitledWindowMask
 #define NSWindowStyleMaskClosable            NSClosableWindowMask
 #define NSWindowStyleMaskResizable           NSResizableWindowMask
diff --git a/tests/examples/gl/cocoa/cocoa-videooverlay.m b/tests/examples/gl/cocoa/cocoa-videooverlay.m
index 75814a71f979d7ef0a567c777e0cbac6034958a0..3151726bc0686fe69ca6fcd227d856016b8b1056 100755 (executable)
--- a/tests/examples/gl/cocoa/cocoa-videooverlay.m
+++ b/tests/examples/gl/cocoa/cocoa-videooverlay.m
@@ -22,7 +22,7 @@
 #include <gst/gst.h>
 #include <gst/video/videooverlay.h>
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
 #define NSEventMaskAny                       NSAnyEventMask
 #define NSWindowStyleMaskTitled              NSTitledWindowMask
 #define NSWindowStyleMaskClosable            NSClosableWindowMask
Domain: Multimedia / Media Common;