Changeset 50074 in vbox

Timestamp:

Jan 14, 2014 5:14:14 AM (11 years ago)

Author:

vboxsync

Message:

The meaning of LWIP_PREFIX_BYTEORDER_FUNCS was inverted in lwip-1.4
and that was not accounted for when old lwipopts.h was used as the
base for the new one.

Undef LWIP_PREFIX_BYTEORDER_FUNCS in lwipopts.h and drop the code that
had to be added to lwip-namespace.h to compensate - it does the same
redefinition dance that lwip's def.h already does.

Same object code is generated.

Location:

trunk/src/VBox/Devices/Network

Files:

• lwip-new/vbox/include/lwip-namespace.h (modified) (1 diff)
• lwipopts.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-namespace.h

@@ -222 +222 @@
 #define lwip_etharp_init()
 
-#ifndef htons
-# define htons   lwip_htons
-#endif
-
-#ifndef ntohs
-# define ntohs   lwip_ntohs
-#endif
-
-#ifndef htonl
-# define htonl   lwip_htonl
-#endif
-
-#ifndef ntohl
-# define ntohl   lwip_ntohl
-#endif
 #endif  /* _VBOX_LWIP_NAMESPACE_H_ */

trunk/src/VBox/Devices/Network/lwipopts.h

@@ -111 +111 @@
 
 /** Attempt to get rid of htons etc. macro issues. */
-#define LWIP_PREFIX_BYTEORDER_FUNCS
+#undef LWIP_PREFIX_BYTEORDER_FUNCS
 
 #define LWIP_NOASSERT 0