From 91773de7ac4e07643fc47f1f0c1fdb6a255f53d2 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Fri, 23 Aug 2019 21:26:09 +0200 Subject: Mac: Fix missing NSWindowStyleMask type on 10.11 --- pugl/detail/mac.m | 8 ++++++++ pugl/detail/mac_gl.m | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'pugl') diff --git a/pugl/detail/mac.m b/pugl/detail/mac.m index efa4d78..ca2cb7c 100644 --- a/pugl/detail/mac.m +++ b/pugl/detail/mac.m @@ -32,6 +32,14 @@ #include +#ifndef __MAC_10_10 +typedef NSUInteger NSEventModifierFlags; +#endif + +#ifndef __MAC_10_12 +typedef NSUInteger NSWindowStyleMask; +#endif + static NSRect rectToScreen(NSRect rect) { diff --git a/pugl/detail/mac_gl.m b/pugl/detail/mac_gl.m index 428cc1a..145b614 100644 --- a/pugl/detail/mac_gl.m +++ b/pugl/detail/mac_gl.m @@ -24,9 +24,7 @@ #include "pugl/pugl_stub.h" #ifndef __MAC_10_10 -#define NSOpenGLProfileVersion4_1Core NSOpenGLProfileVersion3_2Core -typedef NSUInteger NSEventModifierFlags; -typedef NSUInteger NSWindowStyleMask; +# define NSOpenGLProfileVersion4_1Core NSOpenGLProfileVersion3_2Core #endif @interface PuglOpenGLView : NSOpenGLView -- cgit v1.2.1