Changeset 14617 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 26, 2008 8:35:39 AM (16 years ago)

Author:

vboxsync

Message:

NAT: finally re-enabled the 64-bit fix

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -22 +22 @@
 SUB_DEPTH = ../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+# temporary, we will remove this in some days
+VBOX_WITH_BSD_REASS = 1
+VBOX_WITH_BSD_TCP_REASS = 1
 
 VBOX_PATH_DEVICES_SRC := $(PATH_SUB_CURRENT)
@@ -549 +553 @@
 ifdef VBOX_WITH_NETFLT
 Drivers_DEFS      += VBOX_WITH_NETFLT
-endif
-ifdef VBOX_WITH_SLIRP_MEMORY_CHECK
-Drivers_DEFS += VBOX_WITH_SLIRP_MEMORY_CHECK
-endif
-ifdef VBOX_WITH_BSD_REASS
-Drivers_DEFS      += VBOX_WITH_BSD_REASS
-endif
-ifdef VBOX_WITH_BSD_TCP_REASS
-Drivers_DEFS      += VBOX_WITH_BSD_TCP_REASS
 endif
 Drivers_INCS      := \
@@ -606 +601 @@
 Drivers_SOURCES += $(VBOX_SLIRP_SOURCES)
  define def_vbox_slirp_cflags
-  $(file)_DEFS = VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
-#  $(file)_DEFS += VBOX_WITH_BSD_REASS VBOX_WITH_BSD_TCP_REASS
+  $(file)_DEFS += \
+      VBOX_WITH_SIMPLIFIED_SLIRP_SYNC \
+      $(if $(VBOX_WITH_BSD_REASS),VBOX_WITH_BSD_REASS,) \
+      $(if $(VBOX_WITH_BSD_TCP_REASS),VBOX_WITH_BSD_TCP_REASS,) \
+      $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),VBOX_WITH_SLIRP_MEMORY_CHECK,)
   ifeq ($(KBUILD_TARGET),win)
    $(file)_CFLAGS = -wd4018