VirtualBox

Changeset 103508 in vbox


Ignore:
Timestamp:
Feb 21, 2024 7:57:46 PM (8 months ago)
Author:
vboxsync
Message:

include/VBox/intnet.h: Fix conflicting API declarations, bugref:3409

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/VBox/intnet.h

    r98103 r103508  
    13011301INTNETR0DECL(int) IntNetR0IfAbortWaitReq(PSUPDRVSESSION pSession, PINTNETIFABORTWAITREQ pReq);
    13021302
     1303/**
     1304 * Callback function for use with IntNetR3Open to signalling incoming data.
     1305 *
     1306 * @param   hIf     Interface handle.
     1307 * @param   pvUser  User parameter.
     1308 */
     1309typedef DECLCALLBACKTYPE(void, FNINTNETIFRECVAVAIL,(INTNETIFHANDLE hIf, void *pvUser));
     1310/** Pointer to a FNINTNETIFRECVAVAIL callback. */
     1311typedef FNINTNETIFRECVAVAIL *PFNINTNETIFRECVAVAIL;
     1312
    13031313
    13041314#if defined(IN_RING0) || defined(IN_INTNET_TESTCASE)
     
    13111321INTNETR0DECL(int)      IntNetR0Open(PSUPDRVSESSION pSession, const char *pszNetwork,
    13121322                                    INTNETTRUNKTYPE enmTrunkType, const char *pszTrunk, uint32_t fFlags,
    1313                                     uint32_t cbSend, uint32_t cbRecv, PINTNETIFHANDLE phIf);
     1323                                    uint32_t cbSend, uint32_t cbRecv, PFNINTNETIFRECVAVAIL pfnRecvAvail, void *pvUser,
     1324                                    PINTNETIFHANDLE phIf);
    13141325INTNETR0DECL(uint32_t) IntNetR0GetNetworkCount(void);
    13151326
     
    13221333INTNETR0DECL(int)       IntNetR0IfSend(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession);
    13231334INTNETR0DECL(int)       IntNetR0IfWait(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, uint32_t cMillies);
    1324 INTNETR0DECL(int)       IntNetR0IfAbortWait(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession);
     1335INTNETR0DECL(int)       IntNetR0IfAbortWait(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fNoMoreWaits);
    13251336
    13261337/** @} */
    13271338#endif /* IN_RING0 */
    1328 
    1329 /**
    1330  * Callback function for use with IntNetR3Open to signalling incoming data.
    1331  *
    1332  * @param   hIf     Interface handle.
    1333  * @param   pvUser  User parameter.
    1334  */
    1335 typedef DECLCALLBACKTYPE(void, FNINTNETIFRECVAVAIL,(INTNETIFHANDLE hIf, void *pvUser));
    1336 /** Pointer to a FNINTNETIFRECVAVAIL callback. */
    1337 typedef FNINTNETIFRECVAVAIL *PFNINTNETIFRECVAVAIL;
    13381339
    13391340#if defined(VBOX_WITH_INTNET_SERVICE_IN_R3) && defined(IN_RING3)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette