From 891425d537850705aeb0b98ea18beb3f4eb12518 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Laheurte?= Date: Sun, 1 Oct 2017 18:21:26 +0200 Subject: [PATCH] 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 --- sys/osxvideo/cocoawindow.m | 2 +- sys/osxvideo/osxvideosink.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m index b833a8a..dab0425 100644 --- a/sys/osxvideo/cocoawindow.m +++ b/sys/osxvideo/cocoawindow.m @@ -41,7 +41,7 @@ /* Debugging category */ #include -#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 54725a2..a140d51 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 -- 2.7.4