Changeset 33408 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 25, 2010 9:57:32 AM (14 years ago)

Author:

vboxsync

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

66997

Message:

Removed VBOX_DYNAMIC_NET_ATTACH, we don't need to keep this optional.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• Makefile.kmk (modified) (1 diff)
• include/ConsoleImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3506 +3506 @@
                         ComAssertRC(vrc);
                     }
-#ifdef VBOX_DYNAMIC_NET_ATTACH
                     if (RT_SUCCESS(vrc) && changeAdapter)
                     {
@@ -3528 +3527 @@
                         }
                     }
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
                 }
 
@@ -3546 +3544 @@
 
 
-#ifdef VBOX_DYNAMIC_NET_ATTACH
 /**
  * Process a network adaptor change.
@@ -3724 +3721 @@
     return rcRet;
 }
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
 
 

trunk/src/VBox/Main/Makefile.kmk

@@ -580 +580 @@
 endif
 
-ifdef VBOX_DYNAMIC_NET_ATTACH
-VBoxC_DEFS += VBOX_DYNAMIC_NET_ATTACH
-endif
-
 VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
 VBoxC_DEFS.win.x86 += _WIN32_WINNT=0x0500

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -507 +507 @@
     HRESULT doCPUAdd(ULONG aCpu);
 
-#ifdef VBOX_DYNAMIC_NET_ATTACH
     HRESULT doNetworkAdapterChange(const char *pszDevice, unsigned uInstance,
                                    unsigned uLun, INetworkAdapter *aNetworkAdapter);
@@ -513 +512 @@
                                                      unsigned uInstance, unsigned uLun,
                                                      INetworkAdapter *aNetworkAdapter);
-#endif /* VBOX_DYNAMIC_NET_ATTACH */
 
 #ifdef VBOX_WITH_USB