Changeset 27509 in vbox for trunk/src/VBox/Runtime/include

Timestamp:

Mar 18, 2010 11:47:16 PM (15 years ago)

Author:

vboxsync

Message:

iprt: Poll on sockets on windows (untested). RTPollSetCount -> RTPollSetGetCount.

Location:

trunk/src/VBox/Runtime/include/internal

Files:

• pipe.h (modified) (1 diff)
• socket.h (modified) (2 diffs)

trunk/src/VBox/Runtime/include/internal/pipe.h

@@ -33 +33 @@
 
 #include <iprt/pipe.h>
+/* Requires Windows.h on windows. */
 
 RT_C_DECLS_BEGIN
 
 #ifdef RT_OS_WINDOWS
-int         rtPipePollGetHandles(RTPIPE hPipe, uint32_t fEvents, PHANDLE ph1, PHANDLE ph2);
-uint32_t    rtPipePollStart(RTPIPE hPipe, RTPOLLSET hPollSet, uint32_t fEvents, bool fNoWait);
-uint32_t    rtPipePollDone(RTPIPE hPipe, uint32_t fEvents);
+int         rtPipePollGetHandle(RTPIPE hPipe, uint32_t fEvents, PHANDLE ph);
+uint32_t    rtPipePollStart(RTPIPE hPipe, RTPOLLSET hPollSet, uint32_t fEvents, bool fFinalEntry, bool fNoWait);
+uint32_t    rtPipePollDone(RTPIPE hPipe, uint32_t fEvents, bool fFinalEntry);
 #endif /* RT_OS_WINDOWS */
 

trunk/src/VBox/Runtime/include/internal/socket.h

@@ -34 +34 @@
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
+/* Currently requires a bunch of socket headers. */
 
 
 RT_C_DECLS_BEGIN
 
+#ifndef IPRT_INTERNAL_SOCKET_POLLING_ONLY
 int rtSocketResolverError(void);
 int rtSocketCreateForNative(RTSOCKETINT **ppSocket,
-#ifdef RT_OS_WINDOWS
+# ifdef RT_OS_WINDOWS
                             SOCKET hNative
-#else
+# else
                             int hNative
-#endif
+# endif
                             );
 int rtSocketCreate(PRTSOCKET phSocket, int iDomain, int iType, int iProtocol);
@@ -52 +54 @@
 int rtSocketConnect(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr);
 int rtSocketSetOpt(RTSOCKET hSocket, int iLevel, int iOption, void const *pvValue, int cbValue);
+#endif /* IPRT_INTERNAL_SOCKET_POLLING_ONLY */
+
+#ifdef RT_OS_WINDOWS
+int         rtSocketPollGetHandle(RTSOCKET hSocket, uint32_t fEvents, PHANDLE ph);
+uint32_t    rtSocketPollStart(RTSOCKET hSocket, RTPOLLSET hPollSet, uint32_t fEvents, bool fFinalEntry, bool fNoWait);
+uint32_t    rtSocketPollDone(RTSOCKET hSocket, uint32_t fEvents, bool fFinalEntry);
+#endif /* RT_OS_WINDOWS */
 
 RT_C_DECLS_END