[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: hurd: fix using hurd.h in C++ programs



This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit 97d48af5f8668b19887befffb542294f0157cd65
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun Dec 4 23:22:43 2016 +0100

    hurd: fix using hurd.h in C++ programs
---
 .../patches/hurd-i386/cvs-hurd_signal.h_c++.diff   | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/debian/patches/hurd-i386/cvs-hurd_signal.h_c++.diff b/debian/patches/hurd-i386/cvs-hurd_signal.h_c++.diff
index 1fddeb9..7b7a535 100644
--- a/debian/patches/hurd-i386/cvs-hurd_signal.h_c++.diff
+++ b/debian/patches/hurd-i386/cvs-hurd_signal.h_c++.diff
@@ -33,3 +33,36 @@ index 85e5152..96f42d5 100644
  	__mach_port_deallocate (__mach_task_self (), msgport);		      \
  	if ((dealloc_refport) && refport != MACH_PORT_NULL)		      \
  	  __mach_port_deallocate (__mach_task_self (), refport);    	      \
+
+commit 71be79a25f1d9efeafa5c634c4499281e8c313f2
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sun Dec 4 23:18:32 2016 +0100
+
+    hurd: fix using hurd.h in C++ programs
+    
+            * hurd/hurd.h: Cast errno constants to error_t to fix usage in C++
+            programs.
+
+diff --git a/hurd/hurd.h b/hurd/hurd.h
+index ec07827..022abb5 100644
+--- a/hurd/hurd.h
++++ b/hurd/hurd.h
+@@ -54,15 +54,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:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: