cvs-hurd_signal.h_c++

commit 2dacdc5eb0171078eeb96b12b0761f533a62f70e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun Nov 27 17:22:22 2016 +0100

    hurd: fix using hurd/signal.h in C++ programs

            * hurd/hurd/signal.h (HURD_MSGPORT_RPC): Cast expressions results to
            error_t to fix usage in C++ programs.

Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name cvs-hurd_signal.h_c++.diff

diff --git a/hurd/hurd.h b/hurd/hurd.h
index 0fdf3c393f9b0f56d1db35269b1e7d62e2851a18..c77b73c226e99429855cff2df2fcd5839ad4c178 100644 (file)
--- a/hurd/hurd.h
+++ b/hurd/hurd.h
@@ -57,15 +57,15 @@ __hurd_fail (error_t err)
     case EMACH_SEND_INVALID_DEST:
     case EMIG_SERVER_DIED:
       /* The server has disappeared!  */
-      err = EIEIO;
+      err = (error_t) EIEIO;
       break;
 
     case KERN_NO_SPACE:
-      err = ENOMEM;
+      err = (error_t) ENOMEM;
       break;
 
     case KERN_INVALID_ARGUMENT:
-      err = EINVAL;
+      err = (error_t) EINVAL;
       break;
 
     case 0:

diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index d45166c401fbd344946d6969d0ef1bed5b432472..baed36c799840847040b3e3764d81ee96b129e67 100644 (file)
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -395,18 +395,18 @@ extern mach_msg_timeout_t _hurd_interrupted_rpc_timeout;
     do                                                                       \
       {                                                                              \
        /* Get the message port.  */                                          \
-       __err = (fetch_msgport_expr);                                         \
+       __err = (error_t) (fetch_msgport_expr);                               \
        if (__err)                                                            \
          break;                                                              \
        /* Get the reference port.  */                                        \
-       __err = (fetch_refport_expr);                                         \
+       __err = (error_t) (fetch_refport_expr);                               \
        if (__err)                                                            \
          {                                                                   \
            /* Couldn't get it; deallocate MSGPORT and fail.  */              \
            __mach_port_deallocate (__mach_task_self (), msgport);            \
            break;                                                            \
          }                                                                   \
-       __err = (rpc_expr);                                                   \
+       __err = (error_t) (rpc_expr);                                         \
        __mach_port_deallocate (__mach_task_self (), msgport);                \
        if ((dealloc_refport) && refport != MACH_PORT_NULL)                   \
          __mach_port_deallocate (__mach_task_self (), refport);              \