diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /libc/misc/sysvipc/msgq.c | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/misc/sysvipc/msgq.c')
| -rw-r--r-- | libc/misc/sysvipc/msgq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/misc/sysvipc/msgq.c b/libc/misc/sysvipc/msgq.c index d67645a4d..e20e3ca64 100644 --- a/libc/misc/sysvipc/msgq.c +++ b/libc/misc/sysvipc/msgq.c @@ -49,10 +49,10 @@ struct new_msg_buf{ #ifdef L_msgrcv #ifdef __NR_msgrcv #define __NR___syscall_msgrcv __NR_msgrcv -static inline _syscall5(int, __syscall_msgrcv, int, msqid, void *, msgp, +static inline _syscall5(ssize_t, __syscall_msgrcv, int, msqid, void *, msgp, size_t, msgsz, long int, msgtyp, int, msgflg) #endif -static inline int do_msgrcv (int msqid, void *msgp, size_t msgsz, +static inline ssize_t do_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp, int msgflg) { #ifdef __NR_msgrcv |