Ignore:
Timestamp:
2010-11-02T18:29:01Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4f35b9ff
Parents:
76e1121f (diff), 28f4adb (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:
1 edited

Legend:

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

    r76e1121f r4687a26c  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    3232
    33 #ifndef __NET_NETIF_REMOTE_H__
    34 #define __NET_NETIF_REMOTE_H__
     33#ifndef LIBNET_NETIF_REMOTE_H_
     34#define LIBNET_NETIF_REMOTE_H_
    3535
    3636#include <async.h>
    37 #include <fibril_synch.h>
    38 #include <ipc/ipc.h>
     37#include <ipc/services.h>
     38#include <adt/measured_strings.h>
     39
     40#include <net/device.h>
     41#include <net/packet.h>
    3942
    4043extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,
Note: See TracChangeset for help on using the changeset viewer.