about summary refs log tree commit diff
path: root/nptl/pt-msgsnd.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-08 08:25:05 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-08 08:25:05 +0000
commitbdb04f922004ff8433591f138e40c09722836c45 (patch)
tree965b2db38d2cd7f9fb5114a10d53e3ddcc2bfad4 /nptl/pt-msgsnd.c
parent3335502bec2220c7d1e89929d489c1a91a1d862b (diff)
downloadglibc-bdb04f922004ff8433591f138e40c09722836c45.tar.gz
glibc-bdb04f922004ff8433591f138e40c09722836c45.tar.xz
glibc-bdb04f922004ff8433591f138e40c09722836c45.zip
Update.
	* scripts/output-format.sed: Fix bug in one of the s expressions
	which used / for one too many things.
Diffstat (limited to 'nptl/pt-msgsnd.c')
-rw-r--r--nptl/pt-msgsnd.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/nptl/pt-msgsnd.c b/nptl/pt-msgsnd.c
index 4297f9dc4e..bc09779c2e 100644
--- a/nptl/pt-msgsnd.c
+++ b/nptl/pt-msgsnd.c
@@ -28,16 +28,13 @@
 int
 msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg)
 {
-  int result;
-  int oldtype;
+  int oldtype = CANCEL_ASYNC ();
 
-  CANCEL_ASYNC (oldtype);
-
-#ifdef INLINE_SYSCALL
-  result = INLINE_SYSCALL (ipc, 5, IPCOP_msgsnd, msqid, msgsz,
-			   msgflg, (void *) msgp);
+#if defined INLINE_SYSCALL && defined __NR_ipc
+  int result = INLINE_SYSCALL (ipc, 5, IPCOP_msgsnd, msqid, msgsz,
+			       msgflg, (void *) msgp);
 #else
-  result = __libc_msgsnd (msqid, msgp, msgsz, msgflg);
+  int result = __libc_msgsnd (msqid, msgp, msgsz, msgflg);
 #endif
 
   CANCEL_RESET (oldtype);