r1956 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any
Author: madcoder
Date: 2007-02-08 01:02:56 +0100 (Thu, 08 Feb 2007)
New Revision: 1956
Added:
glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
Closes: #377416
* patches/any/submitted-argph.h.diff: always have the same __NTH/__THROW
definition everywhere in the glibc, and do not depend upon the includes
ordering for it to be defined correctly. Closes: #377416.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-08 00:02:54 UTC (rev 1955)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-08 00:02:56 UTC (rev 1956)
@@ -129,6 +129,9 @@
wasn't used anyway). Closes: #165417.
* Rework patch for #340871 (patches/m68k/local-mathinline_h.diff to use
__NTH rather than __THROW) in function implementations.
+ * patches/any/submitted-argph.h.diff: always have the same __NTH/__THROW
+ definition everywhere in the glibc, and do not depend upon the includes
+ ordering for it to be defined correctly. Closes: #377416.
-- Aurelien Jarno <aurel32@debian.org> Wed, 7 Feb 2007 13:56:40 +0100
Added: glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff 2007-02-08 00:02:54 UTC (rev 1955)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff 2007-02-08 00:02:56 UTC (rev 1956)
@@ -0,0 +1,45 @@
+Index: glibc-2.5/argp/argp.h
+===================================================================
+--- glibc-2.5.orig/argp/argp.h
++++ glibc-2.5/argp/argp.h
+@@ -33,13 +33,36 @@
+ # define __const const
+ #endif
+
+-#ifndef __THROW
+-# define __THROW
++#ifdef __THROW
++# undef __THROW
+ #endif
+-#ifndef __NTH
+-# define __NTH(fct) fct __THROW
++#ifdef __NTH
++# undef __NTH
+ #endif
+
++#ifdef __GNUC__
++
++/* see <sys/cdefs.h> */
++# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
++# define __THROW __attribute__ ((__nothrow__))
++# define __NTH(fct) __attribute__ ((__nothrow__)) fct
++# else
++# if defined __cplusplus && __GNUC_PREREQ (2,8)
++# define __THROW throw ()
++# define __NTH(fct) fct throw ()
++# else
++# define __THROW
++# define __NTH(fct) fct
++# endif
++# endif
++
++#else /* Not GCC. */
++
++# define __THROW
++# define __NTH(fct) fct
++
++#endif /* GCC. */
++
+ #ifndef __attribute__
+ /* This feature is available in gcc versions 2.5 and later. */
+ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-08 00:02:54 UTC (rev 1955)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-08 00:02:56 UTC (rev 1956)
@@ -126,3 +126,4 @@
any/local-dynamic-resolvconf.diff -p1
any/submitted-nis-netgrp.diff
any/submitted-getcwd-sys_param_h.diff -p0
+any/submitted-argph.h.diff
Reply to: