Changeset 76404 in vbox for trunk/include/VBox/vmm

Timestamp:

Dec 23, 2018 3:48:33 PM (6 years ago)

Author:

vboxsync

Message:

VBox/vmm/pdmnetshaper.h,pdmdev.h: Don't include err.h and assert.h in the former, and don't include the former from the latter. bugref:9344

Location:

trunk/include/VBox/vmm

Files:

• pdmdrv.h (modified) (4 diffs)
• pdmnetshaper.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmdrv.h

@@ -36 +36 @@
 # include <VBox/vmm/pdmasynccompletion.h>
 # include <VBox/vmm/pdmblkcache.h>
-#endif
-#ifdef VBOX_WITH_NETSHAPER
-# include <VBox/vmm/pdmnetshaper.h>
 #endif
 #include <VBox/vmm/tm.h>
@@ -1185 +1182 @@
                                                                 const char *pszDesc));
 
-#ifdef VBOX_WITH_NETSHAPER
     /**
      * Attaches network filter driver to a bandwidth group.
@@ -1194 +1190 @@
      * @param   pFilter         Pointer to the filter we attach.
      */
-    DECLR3CALLBACKMEMBER(int, pfnNetShaperAttach,(PPDMDRVINS pDrvIns, const char *pszBwGroup,
-                                                  PPDMNSFILTER pFilter));
-
+    DECLR3CALLBACKMEMBER(int, pfnNetShaperAttach,(PPDMDRVINS pDrvIns, const char *pszBwGroup, PPDMNSFILTER pFilter));
 
     /**
@@ -1206 +1200 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnNetShaperDetach,(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter));
-#endif /* VBOX_WITH_NETSHAPER */
-
 
     /**

trunk/include/VBox/vmm/pdmnetshaper.h

@@ -28 +28 @@
 
 #include <VBox/types.h>
-#include <VBox/err.h>
 #include <VBox/vmm/pdmnetifs.h>
-#include <iprt/assert.h>
 #include <iprt/sg.h>
 
@@ -61 +59 @@
 } PDMNSFILTER;
 
-/** Pointer to a PDM filter handle. */
-typedef struct PDMNSFILTER *PPDMNSFILTER;
-/** Pointer to a network shaper. */
-typedef struct PDMNETSHAPER *PPDMNETSHAPER;
-
-
 VMMDECL(bool)       PDMNsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer);
 VMMR3_INT_DECL(int) PDMR3NsAttach(PUVM pUVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter);