6 files changed, 24 insertions, 24 deletions
diff --git a/sysdeps/mach/hurd/recv.c b/sysdeps/mach/hurd/recv.c
index b9ed067265..4fa2f79dcd 100644
--- a/sysdeps/mach/hurd/recv.c
+++ b/sysdeps/mach/hurd/recv.c
@@ -40,12 +40,12 @@ __recv (int fd, void *buf, size_t n, int flags)
   int cancel_oldtype;
 
   cancel_oldtype = LIBC_CANCEL_ASYNC();
-  err = HURD_DPORT_USE (fd, __socket_recv (port, &addrport,
-					       flags, &bufp, &nread,
-					       &ports, &nports,
-					       &cdata, &clen,
-					       &flags,
-					       n));
+  err = HURD_DPORT_USE_CANCEL (fd, __socket_recv (port, &addrport,
+						  flags, &bufp, &nread,
+						  &ports, &nports,
+						  &cdata, &clen,
+						  &flags,
+						  n));
   LIBC_CANCEL_RESET (cancel_oldtype);
 
   if (err == MIG_BAD_ID || err == EOPNOTSUPP)
diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c
index ed3d970722..2cd7092088 100644
--- a/sysdeps/mach/hurd/recvfrom.c
+++ b/sysdeps/mach/hurd/recvfrom.c
@@ -43,12 +43,12 @@ __recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addrarg,
   int cancel_oldtype;
 
   cancel_oldtype = LIBC_CANCEL_ASYNC();
-  err = HURD_DPORT_USE (fd, __socket_recv (port, &addrport,
-					   flags, &bufp, &nread,
-					   &ports, &nports,
-					   &cdata, &clen,
-					   &flags,
-					   n));
+  err = HURD_DPORT_USE_CANCEL (fd, __socket_recv (port, &addrport,
+						  flags, &bufp, &nread,
+						  &ports, &nports,
+						  &cdata, &clen,
+						  &flags,
+						  n));
   LIBC_CANCEL_RESET (cancel_oldtype);
 
   if (err)
diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c
index 75c5f37f0e..5ac130fed1 100644
--- a/sysdeps/mach/hurd/recvmsg.c
+++ b/sysdeps/mach/hurd/recvmsg.c
@@ -58,7 +58,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
       while (err == EINTR);
       if (!err)
 	do
-	  err = __USEPORT (AUTH, __auth_user_authenticate (port,
+	  err = __USEPORT_CANCEL (AUTH, __auth_user_authenticate (port,
 					  ref, MACH_MSG_TYPE_MAKE_SEND,
 					  result));
 	while (err == EINTR);
@@ -86,11 +86,11 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
 
   buf = data;
   cancel_oldtype = LIBC_CANCEL_ASYNC();
-  err = HURD_DPORT_USE (fd, __socket_recv (port, &aport,
-					   flags, &data, &len,
-					   &ports, &nports,
-					   &cdata, &clen,
-					   &message->msg_flags, amount));
+  err = HURD_DPORT_USE_CANCEL (fd, __socket_recv (port, &aport,
+						  flags, &data, &len,
+						  &ports, &nports,
+						  &cdata, &clen,
+						  &message->msg_flags, amount));
   LIBC_CANCEL_RESET (cancel_oldtype);
   if (err)
     return __hurd_sockfail (fd, flags, err);
diff --git a/sysdeps/mach/hurd/send.c b/sysdeps/mach/hurd/send.c
index 78edbc2ff3..5be6c3a773 100644
--- a/sysdeps/mach/hurd/send.c
+++ b/sysdeps/mach/hurd/send.c
@@ -31,10 +31,10 @@ __send (int fd, const void *buf, size_t n, int flags)
   int cancel_oldtype;
 
   cancel_oldtype = LIBC_CANCEL_ASYNC();
-  err = HURD_DPORT_USE (fd, __socket_send (port, MACH_PORT_NULL,
-					   flags, buf, n,
-					   NULL, MACH_MSG_TYPE_COPY_SEND, 0,
-					   NULL, 0, &wrote));
+  err = HURD_DPORT_USE_CANCEL (fd, __socket_send (port, MACH_PORT_NULL,
+						  flags, buf, n,
+						  NULL, MACH_MSG_TYPE_COPY_SEND, 0,
+						  NULL, 0, &wrote));
   LIBC_CANCEL_RESET (cancel_oldtype);
 
   if (err == MIG_BAD_ID || err == EOPNOTSUPP)
diff --git a/sysdeps/mach/hurd/sendmsg.c b/sysdeps/mach/hurd/sendmsg.c
index 37ab7f3ce0..d8764c1248 100644
--- a/sysdeps/mach/hurd/sendmsg.c
+++ b/sysdeps/mach/hurd/sendmsg.c
@@ -174,7 +174,7 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
 	err = EIEIO;
     }
 
-  err = HURD_DPORT_USE (fd,
+  err = HURD_DPORT_USE_CANCEL (fd,
 			({
 			  if (err)
 			    err = __socket_create_address (port,
diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c
index a5faf8ea2e..aab3d3dcae 100644
--- a/sysdeps/mach/hurd/sendto.c
+++ b/sysdeps/mach/hurd/sendto.c
@@ -73,7 +73,7 @@ __sendto (int fd,
       return err_port;
     }
 
-  err = HURD_DPORT_USE (fd,
+  err = HURD_DPORT_USE_CANCEL (fd,
 			({
 			  if (addr != NULL)
 			    err = create_address_port (port, addr, addr_len,