Changeset db71e2a in mainline for uspace/srv/net/inetsrv/inetping.h

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/srv/net/inetsrv/inetping.h (modified) (1 diff)

uspace/srv/net/inetsrv/inetping.h

@@ -38 +38 @@
 #define INETPING_H_
 
+#include "inetsrv.h"
+
 extern void inetping_conn(ipc_callid_t, ipc_call_t *, void *);
 extern int inetping_recv(uint16_t, inetping_sdu_t *);