Brendan Shanks : winemac.drv: Fix warnings for constants deprecated by macOS 10.14.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: b4fb13cfadf0b1938a33426758f08449780cbfa4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b4fb13cfadf0b1938a3342675...

Author: Brendan Shanks <bshanks(a)codeweavers.com>
Date:   Wed Jul 22 15:49:57 2020 -0700

winemac.drv: Fix warnings for constants deprecated by macOS 10.14.

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
Signed-off-by: Ken Thomases <ken(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit f9dc364b4e76a613dde1bd0757c6c15f3030f7b5)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/winemac.drv/cocoa_clipboard.m | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m
index 39c3b8f872f..30f3097c3d2 100644
--- a/dlls/winemac.drv/cocoa_clipboard.m
+++ b/dlls/winemac.drv/cocoa_clipboard.m
@@ -23,6 +23,14 @@
 #import "cocoa_event.h"
 #import "cocoa_window.h"
 
+#if !defined(MAC_OS_X_VERSION_10_14) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14
+/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.14. */
+#define NSBitmapImageFileTypeBMP        NSBMPFileType
+#define NSBitmapImageFileTypeGIF        NSGIFFileType
+#define NSBitmapImageFileTypeJPEG       NSJPEGFileType
+#define NSBitmapImageFileTypePNG        NSPNGFileType
+#define NSBitmapImageFileTypeTIFF       NSTIFFFileType
+#endif
 
 static int owned_change_count = -1;
 static int change_count = -1;
@@ -86,11 +94,11 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard)
 
     dispatch_once(&BitmapOutputTypesInitOnce, ^{
         NSArray* bitmapFileTypes = [NSArray arrayWithObjects:
-                                    [NSNumber numberWithUnsignedInteger:NSTIFFFileType],
-                                    [NSNumber numberWithUnsignedInteger:NSPNGFileType],
-                                    [NSNumber numberWithUnsignedInteger:NSBMPFileType],
-                                    [NSNumber numberWithUnsignedInteger:NSGIFFileType],
-                                    [NSNumber numberWithUnsignedInteger:NSJPEGFileType],
+                                    [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeTIFF],
+                                    [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypePNG],
+                                    [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeBMP],
+                                    [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeGIF],
+                                    [NSNumber numberWithUnsignedInteger:NSBitmapImageFileTypeJPEG],
                                     nil];
 
         BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png",