r3096 - in glibc-package/branches/glibc-2.8/debian/patches: . hurd-i386
Author: sthibaul-guest
Date: 2008-08-13 11:22:08 +0000 (Wed, 13 Aug 2008)
New Revision: 3096
Added:
glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-signal-werror.diff
Removed:
glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/submitted-signal-werror.diff
Modified:
glibc-package/branches/glibc-2.8/debian/patches/series
Log:
Take upstream cvs commit instead of submitted patch
Copied: glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-signal-werror.diff (from rev 3095, glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/submitted-signal-werror.diff)
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-signal-werror.diff (rev 0)
+++ glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-signal-werror.diff 2008-08-13 11:22:08 UTC (rev 3096)
@@ -0,0 +1,37 @@
+2008-08-12 Roland McGrath <roland@frob.com>
+
+ * hurd/hurd/signal.h (HURD_MSGPORT_RPC): Avoid -Wparenthesis triggers,
+ in case used outside of libc.
+ Reported by Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+Index: glibc/hurd/hurd/signal.h
+===================================================================
+RCS file: /cvs/glibc/libc/hurd/hurd/signal.h,v
+retrieving revision 1.49
+retrieving revision 1.50
+diff -u -p -r1.49 -r1.50
+--- glibc/hurd/hurd/signal.h 19 Jul 2007 17:20:39 -0000 1.49
++++ glibc/hurd/hurd/signal.h 13 Aug 2008 02:39:55 -0000 1.50
+@@ -1,5 +1,6 @@
+ /* Implementing POSIX.1 signals under the Hurd.
+- Copyright (C) 1993,94,95,96,98,99,2002,2007 Free Software Foundation, Inc.
++ Copyright (C) 1993,94,95,96,98,99,2002,2007,2008
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -342,10 +343,12 @@ extern mach_msg_timeout_t _hurd_interrup
+ do \
+ { \
+ /* Get the message port. */ \
+- if (__err = (fetch_msgport_expr)) \
++ __err = (fetch_msgport_expr); \
++ if (__err) \
+ break; \
+ /* Get the reference port. */ \
+- if (__err = (fetch_refport_expr)) \
++ _err = (fetch_refport_expr); \
++ if (__err) \
+ { \
+ /* Couldn't get it; deallocate MSGPORT and fail. */ \
+ __mach_port_deallocate (__mach_task_self (), msgport); \
Property changes on: glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/cvs-signal-werror.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/submitted-signal-werror.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/submitted-signal-werror.diff 2008-08-13 04:10:54 UTC (rev 3095)
+++ glibc-package/branches/glibc-2.8/debian/patches/hurd-i386/submitted-signal-werror.diff 2008-08-13 11:22:08 UTC (rev 3096)
@@ -1,25 +0,0 @@
-2008-13-08 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * hurd/hurd/signal.h (HURD_MSGPORT_RPC): Add parenthesis around
- assignment used as truth value.
-
-Index: glibc/hurd/hurd/signal.h
-===================================================================
-RCS file: /cvs/glibc/libc/hurd/hurd/signal.h,v
-retrieving revision 1.49
-diff -u -p -r1.49 signal.h
---- glibc/hurd/hurd/signal.h 19 Jul 2007 17:20:39 -0000 1.49
-+++ glibc/hurd/hurd/signal.h 12 Aug 2008 23:16:59 -0000
-@@ -342,10 +342,10 @@ extern mach_msg_timeout_t _hurd_interrup
- do \
- { \
- /* Get the message port. */ \
-- if (__err = (fetch_msgport_expr)) \
-+ if ((__err = (fetch_msgport_expr))) \
- break; \
- /* Get the reference port. */ \
-- if (__err = (fetch_refport_expr)) \
-+ if ((__err = (fetch_refport_expr))) \
- { \
- /* Couldn't get it; deallocate MSGPORT and fail. */ \
- __mach_port_deallocate (__mach_task_self (), msgport); \
Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-13 04:10:54 UTC (rev 3095)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-13 11:22:08 UTC (rev 3096)
@@ -88,7 +88,7 @@
hurd-i386/cvs-fcntl-types.diff
hurd-i386/cvs-lock-memory-clobber.diff
hurd-i386/local-pthread_posix-option.diff
-hurd-i386/submitted-signal-werror.diff
+hurd-i386/cvs-signal-werror.diff
i386/local-biarch.diff
i386/local-clone.diff
Reply to: