mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 13:38:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

Use value instead of version macro when testing for mac OS version

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=788404
This commit is contained in:
Jérôme Laheurte 2017-10-01 19:04:15 +02:00 committed by Matthew Waters
parent 07d6b7f56d
commit b569ae4832
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m
View file

@ -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 void gst_gl_display_cocoa_finalize (GObject * object);
static guintptr gst_gl_display_cocoa_get_handle (GstGLDisplay * display); 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 #define NSEventMaskAny NSAnyEventMask
#endif #endif

2
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
View file

@ -28,7 +28,7 @@
#include "gstgl_cocoa_private.h" #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 NSWindowStyleMaskTitled NSTitledWindowMask
#define NSWindowStyleMaskClosable NSClosableWindowMask #define NSWindowStyleMaskClosable NSClosableWindowMask
#define NSWindowStyleMaskResizable NSResizableWindowMask #define NSWindowStyleMaskResizable NSResizableWindowMask

2
tests/examples/avsamplesink/main.m
View file

@ -25,7 +25,7 @@
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <CoreMedia/CoreMedia.h> #include <CoreMedia/CoreMedia.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
#define NSWindowStyleMaskBorderless NSBorderlessWindowMask #define NSWindowStyleMaskBorderless NSBorderlessWindowMask
#endif #endif

2
tests/examples/gl/cocoa/cocoa-videooverlay.m
View file

@ -22,7 +22,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/videooverlay.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 NSEventMaskAny NSAnyEventMask
#define NSWindowStyleMaskTitled NSTitledWindowMask #define NSWindowStyleMaskTitled NSTitledWindowMask
#define NSWindowStyleMaskClosable NSClosableWindowMask #define NSWindowStyleMaskClosable NSClosableWindowMask