Changeset b278b4e in mainline for uspace/lib/net/include/nil_interface.h

Timestamp:

2010-10-10T19:52:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

10056483

Parents:

ae972834 (diff), eb51e31 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net.

This is mostly removal of the bundle build support for the networking stack as
we don't want to manually maintain both bundled and modular configurations.

File:

• uspace/lib/net/include/nil_interface.h (modified) (2 diffs)

uspace/lib/net/include/nil_interface.h

@@ -68 +68 @@
 
 
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-
-#include <nil_local.h>
-#include <packet/packet_server.h>
-
-#define nil_device_state_msg  nil_device_state_msg_local
-#define nil_received_msg      nil_received_msg_local
-
-#else /* CONFIG_NETIF_NIL_BUNDLE */
-
 #include <nil_remote.h>
 #include <packet/packet_server.h>
@@ -84 +74 @@
 #define nil_received_msg      nil_received_msg_remote
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 #endif