Ignore:
Timestamp:
2010-04-04T21:41:47Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5db9084
Parents:
36a75a2 (diff), ee7e82a9 (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 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/generic/packet_remote.c

    r36a75a2 r59ecd4a  
    3838#include <async.h>
    3939#include <errno.h>
    40 
    4140#include <ipc/ipc.h>
    4241#include <sys/mman.h>
    4342
    44 #include "../../err.h"
    45 #include "../../messages.h"
    46 
    47 #include "packet.h"
    48 #include "packet_client.h"
    49 #include "packet_header.h"
    50 #include "packet_messages.h"
     43#include <net_err.h>
     44#include <net_messages.h>
     45#include <packet/packet.h>
     46#include <packet/packet_client.h>
     47#include <packet/packet_header.h>
     48#include <packet/packet_messages.h>
    5149
    5250/** Obtains the packet from the packet server as the shared memory block.
Note: See TracChangeset for help on using the changeset viewer.