From: GNU Libc Maintainers Date: Mon, 16 Jan 2017 17:43:37 +0000 (+0000) Subject: cvs-hurd_signal.h_c++ X-Git-Tag: archive/raspbian/2.25-3+rpi1~1^2^2^2^2^2^2^2~69 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ebf37876c52e3d96e071ab093697868eb1caa232;p=glibc.git cvs-hurd_signal.h_c++ commit 2dacdc5eb0171078eeb96b12b0761f533a62f70e Author: Samuel Thibault 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 0fdf3c393..c77b73c22 100644 --- 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 d45166c40..baed36c79 100644 --- 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); \