wip(screen_retriever_ffi): Remove unnecessary __OBJC__ definitions

Author: lijy91

packages/screen_retriever_ffi/example/macos/Podfile.lock

@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  screen_retriever_ffi: a709a16c7c8d844e0516379dfbccbe0ef7eb6c76
+  screen_retriever_ffi: 27e5f36a0be0b643507d89951f561e0fb0119847
 
 PODFILE CHECKSUM: 7eb978b976557c8c1cd717d8185ec483fd090a82
 

packages/screen_retriever_ffi/lib/screen_retriever_ffi_bindings_generated.dart

@@ -168,5 +168,3 @@ final class CursorPoint extends ffi.Struct {
   @ffi.Double()
   external double y;
 }
-
-const int __OBJC__ = 1;

packages/screen_retriever_ffi/macos/Classes/screen_retriever_ffi.mm

@@ -1,11 +1,6 @@
 // Relative import to be able to reuse the C sources.
 // See the comment in ../screen_retriever_ffi.podspec for more information.
 
-// Make sure __OBJC__ is defined before including other files
-#ifndef __OBJC__
-#define __OBJC__ 1
-#endif
-
 // Import Cocoa framework
 #import <Cocoa/Cocoa.h>
 

packages/screen_retriever_ffi/macos/screen_retriever_ffi.podspec

@@ -38,10 +38,10 @@ A new Flutter FFI plugin project.
     'CLANG_ENABLE_OBJC_ARC' => 'YES',
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
     'CLANG_CXX_LIBRARY' => 'libc++',
-    'OTHER_CPLUSPLUSFLAGS' => '-std=c++17 -D__OBJC__=1',
+    'OTHER_CPLUSPLUSFLAGS' => '-std=c++17',
     # Enable Objective-C++ compilation for .cpp files
-    'OTHER_CFLAGS' => '-DOBJC_OLD_DISPATCH_PROTOTYPES=0 -D__OBJC__=1',
-    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) __OBJC__=1',
+    'OTHER_CFLAGS' => '-DOBJC_OLD_DISPATCH_PROTOTYPES=0',
+    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited)',
     'MACOSX_DEPLOYMENT_TARGET' => '10.11'
   }
   s.swift_version = '5.0'

packages/screen_retriever_ffi/src/screen_retriever_macos.h

@@ -3,11 +3,6 @@
 #include <iostream>
 #include "screen_retriever.h"
 
-// Force __OBJC__ to be defined if not already
-#ifndef __OBJC__
-#define __OBJC__ 1
-#endif
-
 // Import Cocoa headers
 #import <Cocoa/Cocoa.h>
 

packages/screen_retriever_ffi/src/screen_retriever_macos.mm

@@ -3,11 +3,6 @@
 #include <iostream>
 #include <string>
 
-// Force __OBJC__ to be defined if not already
-#ifndef __OBJC__
-#define __OBJC__ 1
-#endif
-
 // Import Cocoa headers
 #import <Cocoa/Cocoa.h>
 
@@ -54,8 +49,9 @@
   NSArray<NSScreen*>* screens = [NSScreen screens];
   bool isFirstScreen = true;
 
-  displayList.displays = new Display[screens.count];
-  displayList.count = screens.count;
+  int count = (int) screens.count;
+  displayList.displays = new Display[count];
+  displayList.count = count;
   int index = 0;
   for (NSScreen* screen in screens) {
     displayList.displays[index] = CreateDisplayFromNSScreen(screen, isFirstScreen);