Changeset 85344 in vbox for trunk/src/VBox/HostDrivers/darwin/VBoxNetSend.h

Timestamp:

Jul 14, 2020 6:46:00 PM (4 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/darwin: Some adjustments for making it build against a 10.15 SDK. bugref:9790

File:

• trunk/src/VBox/HostDrivers/darwin/VBoxNetSend.h (modified) (1 diff)

trunk/src/VBox/HostDrivers/darwin/VBoxNetSend.h

@@ -40 +40 @@
 
 # include <sys/socket.h>
-# include <net/kpi_interface.h>
+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500 /* The 10.15 SDK has a slightly butchered API deprecation attempt. */
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wmacro-redefined"      /* Each header redefines __NKE_API_DEPRECATED. */
+#  pragma clang diagnostic ignored "-Wmissing-declarations" /* Misplaced __NKE_API_DEPRECATED; in kpi_mbuf.h. */
+#  include <net/kpi_interface.h>
+#  include <sys/kpi_mbuf.h>
+#  include <net/if.h>
+#  pragma clang diagnostic pop
+# else /* < 10.15 */
+#  include <net/kpi_interface.h>
 RT_C_DECLS_BEGIN /* Buggy 10.4 headers, fixed in 10.5. */
-# include <sys/kpi_mbuf.h>
+#  include <sys/kpi_mbuf.h>
 RT_C_DECLS_END
-# include <net/if.h>
+#  include <net/if.h>
+# endif /* < 10.15 */
+
 
 RT_C_DECLS_BEGIN