Changeset f14291b in mainline for uspace/app/ping/ping.c


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/app/ping/ping.c

    r1882525 rf14291b  
    4242#include <ipc/services.h>
    4343#include <str_error.h>
     44#include <errno.h>
    4445#include <arg_parse.h>
    4546
    46 #include <icmp_api.h>
    47 #include <in.h>
    48 #include <in6.h>
    49 #include <inet.h>
    50 #include <ip_codes.h>
    51 #include <socket_errno.h>
    52 #include <socket_parse.h>
     47#include <net/icmp_api.h>
     48#include <net/in.h>
     49#include <net/in6.h>
     50#include <net/inet.h>
     51#include <net/socket_parse.h>
     52#include <net/ip_codes.h>
    5353
    5454#include "print_error.h"
Note: See TracChangeset for help on using the changeset viewer.