Changeset 104670 in vbox

Timestamp:

May 16, 2024 10:42:46 AM (7 months ago)

Author:

vboxsync

Message:

VBoxGuest-darwin.cpp: Ignore known (unavoidable) deprecation warnings and avoid function pointer mess in the cases where Apple got it right. bugref:3409

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp

@@ -139 +139 @@
 
 private:
+    RT_GCC_NO_WARN_DEPRECATED_BEGIN
     IOPCIDevice                *m_pIOPCIDevice;
+    RT_GCC_NO_WARN_DEPRECATED_END
     IOMemoryMap                *m_pMap;
     IOFilterInterruptEventSource *m_pInterruptSrc;
@@ -145 +147 @@
     bool setupVmmDevInterrupts(IOService *pProvider);
     bool disableVmmDevInterrupts(void);
+    RT_GCC_NO_WARN_DEPRECATED_BEGIN
     bool isVmmDev(IOPCIDevice *pIOPCIDevice);
+    RT_GCC_NO_WARN_DEPRECATED_END
 
 protected:
@@ -238 +242 @@
     /*.d_mmap     = */ eno_mmap,
     /*.d_strategy = */ eno_strat,
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+    /*.d_getc     = */ eno_getc,
+    /*.d_putc     = */ eno_putc,
+#else /* Apple got it wrong in the 10.5 SDK */
     /*.d_getc     = */ (void *)(uintptr_t)&enodev, //eno_getc,
     /*.d_putc     = */ (void *)(uintptr_t)&enodev, //eno_putc,
+#endif
     /*.d_type     = */ 0
 };
@@ -877 +886 @@
          * Make sure it's a PCI device.
          */
+        RT_GCC_NO_WARN_DEPRECATED_BEGIN
         m_pIOPCIDevice = OSDynamicCast(IOPCIDevice, pProvider);
+        RT_GCC_NO_WARN_DEPRECATED_END
         if (m_pIOPCIDevice)
         {
@@ -1127 +1138 @@
  * @param   pIOPCIDevice    The PCI device we think might be the VMM device.
  */
+RT_GCC_NO_WARN_DEPRECATED_BEGIN
 bool org_virtualbox_VBoxGuest::isVmmDev(IOPCIDevice *pIOPCIDevice)
+RT_GCC_NO_WARN_DEPRECATED_END
 {
     if (pIOPCIDevice)