Changeset 15638 in vbox for trunk/src

Timestamp:

Dec 18, 2008 7:58:57 AM (16 years ago)

Author:

vboxsync

Message:

slirp:icmp: missed changes (build fix)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libslirp.h (modified) (2 diffs)
• slirp_state.h (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -54 +54 @@
                    int guest_port);
 
-#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS) 
+#if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
 
-# ifdef VBOX_WITH_SLIRP_ICMP
 
 /*
  * ICMP handle state change
  */
-#define VBOX_ICMP_EVENT_INDEX           0
+# define VBOX_ICMP_EVENT_INDEX           0
 
 /**
@@ -70 +69 @@
  *  - wakeup
  */
-#  define VBOX_WAKEUP_EVENT_INDEX       1
+# define VBOX_WAKEUP_EVENT_INDEX       1
 
 /*
  * UDP/TCP socket state change (socket ready to receive, to send, ...)
  */
-#  define VBOX_SOCKET_EVENT_INDEX       2
+# define VBOX_SOCKET_EVENT_INDEX       2
 
 /*
  * The number of events for WSAWaitForMultipleEvents().
  */
-#  define VBOX_EVENT_COUNT              3
-
-# else
-
-#  define VBOX_WAKEUP_EVENT_INDEX       0
-#  define VBOX_SOCKET_EVENT_INDEX       1
-#  define VBOX_EVENT_COUNT              2
-
-# endif
+# define VBOX_EVENT_COUNT              3
 
 HANDLE *slirp_get_events(PNATState pData);

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -21 +21 @@
 #ifndef _slirp_state_h_
 #define _slirp_state_h_
-#ifdef VBOX_WITH_SLIRP_ICMP
 #include "ip_icmp.h"
-#endif
 
 /** Number of DHCP clients supported by NAT. */
@@ -120 +118 @@
     struct socket udb;
     struct socket *udp_last_so;
-#ifdef VBOX_WITH_SLIRP_ICMP
     struct socket icmp_socket;
     struct icmp_storage icmp_msg_head;
@@ -126 +123 @@
     void *pvIcmpBuffer;
     size_t szIcmpBuffer;
-    /* Accordin MSDN specification IcmpParseReplies 
+    /* Accordin MSDN specification IcmpParseReplies
      * function should be detected in runtime
      */
@@ -133 +130 @@
     HMODULE hmIcmpLibrary;
 # endif
-#endif
 #if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
 # define VBOX_SOCKET_EVENT (pData->phEvents[VBOX_SOCKET_EVENT_INDEX])