Ignore:
Timestamp:
2010-10-13T22:48:25Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ef689ef0
Parents:
b278b4e (diff), 753bca3 (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.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/net/icmp_common.h

    rb278b4e r10056483  
    2727 */
    2828
    29 /** @addtogroup icmp
     29/** @addtogroup libc
    3030 *  @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP module common interface.
     34 * ICMP module common interface.
    3535 */
    3636
    37 #ifndef __NET_ICMP_COMMON_H__
    38 #define __NET_ICMP_COMMON_H__
     37#ifndef LIBC_ICMP_COMMON_H_
     38#define LIBC_ICMP_COMMON_H_
    3939
    4040#include <ipc/services.h>
    41 
    4241#include <sys/time.h>
    4342
    44 /** Default timeout for incoming connections in microseconds.
    45  */
     43/** Default timeout for incoming connections in microseconds. */
    4644#define ICMP_CONNECT_TIMEOUT    (1 * 1000 * 1000)
    4745
    48 /** Connects to the ICMP module.
    49  *  @param service The ICMP module service. Ignored parameter.
    50  *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
    51  *  @returns The ICMP module phone on success.
    52  *  @returns ETIMEOUT if the connection timeouted.
    53  */
    54 extern int icmp_connect_module(services_t service, suseconds_t timeout);
     46extern int icmp_connect_module(services_t, suseconds_t);
    5547
    5648#endif
Note: See TracChangeset for help on using the changeset viewer.