summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Laheurte <jerome@jeromelaheurte.net>2017-10-01 18:21:26 +0200
committerTim-Philipp Müller <tim@centricular.com>2018-02-08 15:49:59 +0000
commit891425d537850705aeb0b98ea18beb3f4eb12518 (patch)
treeb0f73700535c337b01f7f966c99e7171d792f285
parent7ac08fd0a56f8632d145ab8e2af48dc52180354d (diff)
osxvideosink: fix build on macOS versions < 12.0
Use value instead of version macro when testing for mac OS version, since the define for the newer version may not be defined when compiling against older versions. https://bugzilla.gnome.org/show_bug.cgi?id=788402
-rw-r--r--sys/osxvideo/cocoawindow.m2
-rw-r--r--sys/osxvideo/osxvideosink.m2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m
index b833a8ac7..dab04256b 100644
--- a/sys/osxvideo/cocoawindow.m
+++ b/sys/osxvideo/cocoawindow.m
@@ -41,7 +41,7 @@
/* Debugging category */
#include <gst/gstinfo.h>
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
#define NSEventTypeMouseMoved NSMouseMoved
#define NSEventTypeLeftMouseDown NSLeftMouseDown
#define NSEventTypeLeftMouseUp NSLeftMouseUp
diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m
index 54725a2bc..a140d518d 100644
--- a/sys/osxvideo/osxvideosink.m
+++ b/sys/osxvideo/osxvideosink.m
@@ -82,7 +82,7 @@ static GCond _run_loop_cond;
static GstOSXVideoSinkClass *sink_class = NULL;
static GstVideoSinkClass *parent_class = NULL;
-#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