Changeset 50073 in vbox

Timestamp:

Jan 14, 2014 4:50:46 AM (11 years ago)

Author:

vboxsync

Message:

Drop lwip-namespace.h renaming for VBoxNetNAT. It is only necessary
in VBoxDD to avoid conflicts with slirp.

#undef LWIP_PREFIX_BYTEORDER_FUNCS - its meaning was inverted in
lwip-1.4 and lwip-namespace.h has to redo the same redefinition dance
that lwip's def.h does when LWIP_PREFIX_BYTEORDER_FUNCS is undefined
(this is to be addressed for VBoxDD separately).

Debugging is more comfortable when names are not randomly renamed with
some of them being original short names and some redefined with lwip_
prefix.

Almost the same object code is generated, with slighly different
offsets into .rodata because of changed func.

File:

• trunk/src/VBox/NetworkServices/NAT/lwipopts.h (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/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
@@ -217 +217 @@
 #define free(x) RTMemFree(x)
 
-
-#include "lwip-namespace.h"
-
 #endif /* _VBOX_NETNAT_LWIP_OPTS_H_ */