Changeset 15092 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 8, 2008 8:01:22 AM (16 years ago)

Author:

vboxsync

Message:

slirp:typo

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -11 +11 @@
 #include <iprt/assert.h>
 
-#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) 
-# if !defined(RT_OS_WINDOWS)
-#  define DO_ENGAGE_EVENT1(so, fdset, label)            \
+#if !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || (defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && !defined(RT_OS_WINDOWS))
+# define DO_ENGAGE_EVENT1(so, fdset, label)             \
         do {                                            \
-                FD_SET((so)->s, (fdset));              \
+                FD_SET((so)->s, (fdset));               \
                 UPD_NFDS((so)->s);                      \
         } while(0)
 
 
-#  define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label)   \
+# define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label)    \
         do {                                            \
                 FD_SET((so)->s, (fdset0));              \
@@ -26 +25 @@
                 UPD_NFDS((so)->s);                      \
         } while(0)
-# else /* !RT_OS_WINDOWS */
-#  define DO_ENGAGE_EVENT1(so, fdset0, label)                                                           \
+#else /* !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) || (defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && !defined(RT_OS_WINDOWS) */
+# define DO_ENGAGE_EVENT1(so, fdset0, label)                                                            \
         do {                                                                                            \
                 rc = WSAEventSelect((so)->s, VBOX_SOCKET_EVENT, FD_ALL_EVENTS);                         \
@@ -39 +38 @@
         } while(0);                                                                                     \
 
-#  define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label) DO_ENGAGE_EVENT1((so), (fdset0), label)
-# endif /* RT_OS_WINDOWS */
+# define DO_ENGAGE_EVENT2(so, fdset0, fdset1, label) DO_ENGAGE_EVENT1((so), (fdset0), label)
+#endif 
 
 # define TCP_ENGAGE_EVENT1(so, fdset0)                   \
@@ -49 +48 @@
 
 #define UDP_ENGAGE_EVENT(so, fdset) DO_ENGAGE_EVENT1((so), (fdset), UDP) 
-#endif /* VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
 
 static const uint8_t special_ethaddr[6] = {