Ignore:
Timestamp:
2010-11-22T15:39:53Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0eddb76, aae339e9
Parents:
9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:
1 edited

Legend:

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

    r9a1d8ab r0b749a3  
    2727 */
    2828
    29 /** @addtogroup packet
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    3232
    33 #ifndef __NET_PACKET_REMOTE_H__
    34 #define __NET_PACKET_REMOTE_H__
     33#ifndef LIBNET_PACKET_REMOTE_H_
     34#define LIBNET_PACKET_REMOTE_H_
    3535
    36 #include <packet/packet.h>
     36#include <net/packet.h>
     37#include <sys/types.h>
    3738
    38 extern int packet_translate_remote(int, packet_ref, packet_id_t);
    39 extern packet_t packet_get_4_remote(int, size_t, size_t, size_t, size_t);
    40 extern packet_t packet_get_1_remote(int, size_t);
     39extern int packet_translate_remote(int, packet_t **, packet_id_t);
     40extern packet_t *packet_get_4_remote(int, size_t, size_t, size_t, size_t);
     41extern packet_t *packet_get_1_remote(int, size_t);
    4142extern void pq_release_remote(int, packet_id_t);
    4243
Note: See TracChangeset for help on using the changeset viewer.