Changeset fdbc3ff in mainline for uspace/lib/c/generic/net/icmp_common.c

Timestamp:

2010-11-19T23:50:06Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/lib/c/generic/net/icmp_common.c (modified) (1 diff)

uspace/lib/c/generic/net/icmp_common.c

@@ -50 +50 @@
  * @param[in] timeout   The connection timeout in microseconds. No timeout if
  *                      set to zero.
- * @returns             The ICMP module phone on success.
- * @returns             ETIMEOUT if the connection timeouted.
+ * @return              The ICMP module phone on success.
+ * @return              ETIMEOUT if the connection timeouted.
  */
 int icmp_connect_module(services_t service, suseconds_t timeout)