Ignore:
Timestamp:
2010-10-19T20:55:53Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a93d79a
Parents:
1882525 (diff), a7a85d16 (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/icmp_interface.h

    r1882525 rf14291b  
    3434#define __NET_ICMP_INTERFACE_H__
    3535
     36#include <net/socket_codes.h>
    3637#include <sys/types.h>
    3738
    38 #include <net_device.h>
     39#include <net/device.h>
    3940#include <adt/measured_strings.h>
    40 #include <packet/packet.h>
    41 #include <inet.h>
    42 #include <ip_codes.h>
    43 #include <socket_codes.h>
    44 #include <icmp_codes.h>
    45 #include <icmp_common.h>
     41#include <net/packet.h>
     42#include <net/inet.h>
     43#include <net/ip_codes.h>
     44#include <net/icmp_codes.h>
     45#include <net/icmp_common.h>
    4646
    4747/** @name ICMP module interface
Note: See TracChangeset for help on using the changeset viewer.