Changeset 44469 in vbox for trunk/src/VBox/Runtime/r3/socket.cpp

Timestamp:

Jan 30, 2013 3:37:55 PM (12 years ago)

Author:

vboxsync

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

83477

Message:

IPRT: Merging poll-win.cpp and poll-posix.cpp, part 1.

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -1770 +1770 @@
 }
 
-#ifdef RT_OS_WINDOWS
 
 /**
@@ -1779 +1778 @@
  * @param   hSocket             The socket handle.
  * @param   fEvents             The events we're polling for.
- * @param   ph                  where to put the primary handle.
- */
-int rtSocketPollGetHandle(RTSOCKET hSocket, uint32_t fEvents, PHANDLE ph)
+ * @param   phNative            Where to put the primary handle.
+ */
+int rtSocketPollGetHandle(RTSOCKET hSocket, uint32_t fEvents, PRTHCINTPTR phNative)
 {
     RTSOCKETINT *pThis = hSocket;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE);
+#ifdef RT_OS_WINDOWS
     AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS);
 
     int rc = VINF_SUCCESS;
     if (pThis->hEvent != WSA_INVALID_EVENT)
-        *ph = pThis->hEvent;
-    else
-    {
-        *ph = pThis->hEvent = WSACreateEvent();
+        *phNative = (RTHCINTPTR)pThis->hEvent;
+    else
+    {
+        pThis->hEvent = WSACreateEvent();
+        *phNative = (RTHCINTPTR)pThis->hEvent;
         if (pThis->hEvent == WSA_INVALID_EVENT)
             rc = rtSocketError();
@@ -1800 +1801 @@
     rtSocketUnlock(pThis);
     return rc;
-}
-
+
+#else  /* !RT_OS_WINDOWS */
+    *phNative = (RTHCUINTPTR)pThis->hNative;
+    return VINF_SUCCESS;
+#endif /* !RT_OS_WINDOWS */
+}
+
+#ifdef RT_OS_WINDOWS
 
 /**