Ignore:
Timestamp:
2010-10-23T20:28:55Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc8d91a
Parents:
33dbbd2 (diff), 018d79b8 (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 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/include/nil_interface.h

    r33dbbd2 rdfda6a1  
    2727 */
    2828
    29 /** @addtogroup net_nil
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    33 #ifndef __NET_NIL_INTERFACE_H__
    34 #define __NET_NIL_INTERFACE_H__
     33#ifndef LIBNET_NIL_INTERFACE_H_
     34#define LIBNET_NIL_INTERFACE_H_
    3535
    3636#include <async.h>
     
    4747
    4848#define nil_packet_size_req(nil_phone, device_id, packet_dimension) \
    49         generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, device_id, \
    50             packet_dimension)
     49        generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, \
     50            device_id, packet_dimension)
    5151
    5252#define nil_get_addr_req(nil_phone, device_id, address, data) \
Note: See TracChangeset for help on using the changeset viewer.