Changeset 94722 in vbox

Timestamp:

Apr 27, 2022 1:42:50 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151102

Message:

Main: Compile fixes when VBOX_WITH_HOSTNETIF_API is not defined.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (7 diffs)
• HostNetworkInterfaceImpl.cpp (modified) (3 diffs)
• Performance.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -433 +433 @@
 #endif
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
+#if defined(VBOX_WITH_HOSTNETIF_API) && (defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD))
     /* Extract the list of configured host-only interfaces */
     std::set<Utf8Str> aConfiguredNames;
@@ -467 +467 @@
     }
 
-#endif /* defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) */
+#endif /* defined(VBOX_WITH_HOSTNETIF_API) && (defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)) */
 
     /* Confirm a successful initialization */
@@ -1523 +1523 @@
     return S_OK;
 #else
+    RT_NOREF(aHostInterface, aProgress);
     return E_NOTIMPL;
 #endif
@@ -1584 +1585 @@
     return r == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;
 #else
+    RT_NOREF(aId, aProgress);
     return E_NOTIMPL;
 #endif
@@ -1753 +1755 @@
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
+    RT_NOREF(aName, aNetworkInterface);
     return E_NOTIMPL;
 #else
@@ -1796 +1799 @@
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
+    RT_NOREF(aId, aNetworkInterface);
     return E_NOTIMPL;
 #else
@@ -1876 +1880 @@
     return S_OK;
 #else
+    RT_NOREF(aType, aNetworkInterfaces);
     return E_NOTIMPL;
 #endif

trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

@@ -82 +82 @@
 
     unconst(mInterfaceName) = aInterfaceName;
+#ifdef VBOX_WITH_HOSTNETIF_API
     unconst(mNetworkName) = i_composeNetworkName(aShortName);
+#endif
     unconst(mShortName) = aShortName;
     unconst(mGuid) = aGuid;
@@ -541 +543 @@
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
+    RT_NOREF(aIPAddress, aNetworkMask);
     return E_NOTIMPL;
 #else
@@ -631 +634 @@
 {
 #ifndef VBOX_WITH_HOSTNETIF_API
+    RT_NOREF(aIPV6Address, aIPV6NetworkMaskPrefixLength);
     return E_NOTIMPL;
 #else

trunk/src/VBox/Main/src-server/Performance.cpp

@@ -678 +678 @@
 static bool getLinkSpeed(const char *szShortName, uint32_t *pSpeed)
 {
+# ifdef VBOX_WITH_HOSTNETIF_API
     NETIFSTATUS enmState = NETIF_S_UNKNOWN;
     int vrc = NetIfGetState(szShortName, &enmState);
@@ -691 +692 @@
     }
     return true;
+# else  /* !VBOX_WITH_HOSTNETIF_API */
+    RT_NOREF(szShortName, pSpeed);
+    return false;
+# endif /* VBOX_WITH_HOSTNETIF_API */
 }