Changeset eb083ad in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2012-05-17T21:09:06Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (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 mainline changes

File:

• uspace/srv/net/inetsrv/inetsrv.c (moved) (moved from uspace/srv/net/inet/inet.c ) (2 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -50 +50 @@
 #include "icmp.h"
 #include "icmp_std.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inetcfg.h"
 #include "inetping.h"
@@ -57 +57 @@
 #include "sroute.h"
 
-#define NAME "inet"
+#define NAME "inetsrv"
 
 static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);