Changeset cf2af94 in mainline for uspace/lib/c/include/ipc/socket.h


Ignore:
Timestamp:
2011-02-09T11:46:47Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb15135a
Parents:
a49c4002 (diff), 0b37882 (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

Local modifications:

  • change pipefs and ext2 to build again (use async_* calls instead of ipc_*)
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/ipc/socket.h

    ra49c4002 rcf2af94  
    3838#define LIBC_SOCKET_MESSAGES_H_
    3939
    40 #include <ipc/ipc.h>
    4140#include <ipc/net.h>
    4241
    … …  
    8483#define SOCKET_SET_SOCKET_ID(answer, value) \
    8584        do { \
    86                 ipcarg_t argument = (ipcarg_t) (value); \
     85                sysarg_t argument = (sysarg_t) (value); \
    8786                IPC_SET_ARG1(answer, argument); \
    8887        } while (0)
    … …  
    102101#define SOCKET_SET_READ_DATA_LENGTH(answer, value) \
    103102        do { \
    104                 ipcarg_t argument = (ipcarg_t) (value); \
     103                sysarg_t argument = (sysarg_t) (value); \
    105104                IPC_SET_ARG1(answer, argument); \
    106105        } while (0)
    … …  
    147146#define SOCKET_SET_DATA_FRAGMENT_SIZE(answer, value) \
    148147        do { \
    149                 ipcarg_t argument = (ipcarg_t) (value); \
     148                sysarg_t argument = (sysarg_t) (value); \
    150149                IPC_SET_ARG2(answer, argument); \
    151150        } while (0)
    … …  
    156155#define SOCKET_SET_ADDRESS_LENGTH(answer, value) \
    157156        do { \
    158                 ipcarg_t argument = (ipcarg_t) (value); \
     157                sysarg_t argument = (sysarg_t) (value); \
    159158                IPC_SET_ARG3(answer, argument);\
    160159        } while (0)
    … …  
    174173#define SOCKET_SET_HEADER_SIZE(answer, value) \
    175174        do { \
    176                 ipcarg_t argument = (ipcarg_t) (value); \
     175                sysarg_t argument = (sysarg_t) (value); \
    177176                IPC_SET_ARG3(answer, argument); \
    178177        } while (0)
Note: See TracChangeset for help on using the changeset viewer.