[PATCH 0/1] MR4179: winemac.drv: Disable declaration-after-statement warnings in ObjC files.

[Brendan Shanks (＠bshanks)]

Xcode 14.3 (and upstream LLVM 14) fixed [a bug](https://github.com/llvm/llvm-project/issues/51273) where `-Wdeclaration-after-statement` would be ignored when building with C99 or a later language standard. This revealed 22 warnings in ObjC files where variables are declared in the middle of a block.

We could simply fix all of these, but declaring variables in the middle of blocks does feel like idiomatic Objective-C (which is why it was done to begin with). It would also mean changes in 22 places.

Disabling the warning is the other option. It's not ideal, but using a pragma in each file seems like the best way to do so.
(We don't have a way to pass special ObjC-only compiler flags, and even if we did, the '-Wno-declaration-after-statement' would have to come after the '-W', which is fragile.)
Alternately, the pragma (guarded by `#ifdef __OBJC__`) could go into a header file included by all files, like `macdrv_cocoa.h`.

Opinions/suggestions/comments are welcome.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4179

[PATCH 1/1] winemac.drv: Disable declaration-after-statement warnings in ObjC files.

[Brendan Shanks]

From: Brendan Shanks <bshanks(a)codeweavers.com>

---
 dlls/winemac.drv/cocoa_app.m            | 2 ++
 dlls/winemac.drv/cocoa_clipboard.m      | 2 ++
 dlls/winemac.drv/cocoa_cursorclipping.m | 2 ++
 dlls/winemac.drv/cocoa_display.m        | 2 ++
 dlls/winemac.drv/cocoa_event.m          | 2 ++
 dlls/winemac.drv/cocoa_main.m           | 2 ++
 dlls/winemac.drv/cocoa_opengl.m         | 2 ++
 dlls/winemac.drv/cocoa_status_item.m    | 2 ++
 dlls/winemac.drv/cocoa_window.m         | 1 +
 9 files changed, 17 insertions(+)

diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m
index c1a35af5a00..4e26bf1e122 100644
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -25,6 +25,8 @@
 #import "cocoa_event.h"
 #import "cocoa_window.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 
 static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponseMode";
 
diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m
index cc5d1ffe55e..a3dca323705 100644
--- a/dlls/winemac.drv/cocoa_clipboard.m
+++ b/dlls/winemac.drv/cocoa_clipboard.m
@@ -23,6 +23,8 @@
 #import "cocoa_event.h"
 #import "cocoa_window.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 #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
diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m
index faefa5030e7..cfb7ff529e7 100644
--- a/dlls/winemac.drv/cocoa_cursorclipping.m
+++ b/dlls/winemac.drv/cocoa_cursorclipping.m
@@ -23,6 +23,8 @@
 #import "cocoa_cursorclipping.h"
 #import "cocoa_window.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 
 /* Neither Quartz nor Cocoa has an exact analog for Win32 cursor clipping.
  *
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
index 856fa2ea77a..fbbe16efcbf 100644
--- a/dlls/winemac.drv/cocoa_display.m
+++ b/dlls/winemac.drv/cocoa_display.m
@@ -26,6 +26,8 @@
 #endif
 #include "macdrv_cocoa.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 static uint64_t dedicated_gpu_id;
 static uint64_t integrated_gpu_id;
 
diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m
index 701de6eb8f7..11dd9c3c784 100644
--- a/dlls/winemac.drv/cocoa_event.m
+++ b/dlls/winemac.drv/cocoa_event.m
@@ -29,6 +29,8 @@
 #import "cocoa_app.h"
 #import "cocoa_window.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 
 static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThreadDictionaryKey";
 
diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m
index 73a2514a61a..8c9507a75b1 100644
--- a/dlls/winemac.drv/cocoa_main.m
+++ b/dlls/winemac.drv/cocoa_main.m
@@ -25,6 +25,8 @@
 #include "macdrv_cocoa.h"
 #import "cocoa_app.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 
 /* Condition values for an NSConditionLock. Used to signal between run_cocoa_app
    and macdrv_start_cocoa_app so the latter knows when the former is running
diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m
index 43574972600..31a1f28970b 100644
--- a/dlls/winemac.drv/cocoa_opengl.m
+++ b/dlls/winemac.drv/cocoa_opengl.m
@@ -26,6 +26,8 @@
 #include "cocoa_app.h"
 #include "cocoa_event.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 
 @interface WineOpenGLContext ()
 @property (retain, nonatomic) NSView* latentView;
diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m
index 1ffdeb8048d..31f8a668d81 100644
--- a/dlls/winemac.drv/cocoa_status_item.m
+++ b/dlls/winemac.drv/cocoa_status_item.m
@@ -23,6 +23,8 @@
 #import "cocoa_app.h"
 #import "cocoa_event.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+
 
 @interface WineStatusItem : NSView
 {
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index e2373b4837c..5700bd3d531 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -33,6 +33,7 @@
 #import "cocoa_event.h"
 #import "cocoa_opengl.h"
 
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
 
 #if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4179