r1286 - in glibc-package/trunk/debian: . patches
Author: aurel32
Date: 2006-03-10 16:39:14 +0000 (Fri, 10 Mar 2006)
New Revision: 1286
Added:
glibc-package/trunk/debian/patches/argp_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add argp_h.diff fixes (Remove __NTH for __argp_usage inline function)
by Ulrich Drepper (patch from HEAD). (Closes: #355264)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-03-10 13:51:51 UTC (rev 1285)
+++ glibc-package/trunk/debian/changelog 2006-03-10 16:39:14 UTC (rev 1286)
@@ -11,6 +11,8 @@
* Add tst-setcontext_c.diff (fix the arguments passed to setcontext during
test) from upstream.
* Create a link /usr/lib32 -> /emul/ia32-linux/usr/lib on amd64.
+ * Add argp_h.diff fixes (Remove __NTH for __argp_usage inline function)
+ by Ulrich Drepper (patch from HEAD). (Closes: #355264)
[ Denis Barbier ]
* locales.config: If $DEBCONF_IS_A_REGISTRY is set to a non-empty value,
Added: glibc-package/trunk/debian/patches/argp_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/argp_h.diff 2006-03-10 13:51:51 UTC (rev 1285)
+++ glibc-package/trunk/debian/patches/argp_h.diff 2006-03-10 16:39:14 UTC (rev 1286)
@@ -0,0 +1,21 @@
+2005-10-13 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #1373]
+ * argp/argp.h: Remove __NTH for __argp_usage inline function.
+
+===================================================================
+RCS file: /cvs/glibc/libc/argp/argp.h,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -r1.30 -r1.31
+--- libc/argp/argp.h 2004/09/07 22:23:45 1.30
++++ libc/argp/argp.h 2005/10/14 05:53:47 1.31
+@@ -561,7 +561,7 @@
+ # endif
+
+ ARGP_EI void
+-__NTH (__argp_usage (__const struct argp_state *__state))
++__argp_usage (__const struct argp_state *__state)
+ {
+ __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+ }
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-03-10 13:51:51 UTC (rev 1285)
+++ glibc-package/trunk/debian/patches/series 2006-03-10 16:39:14 UTC (rev 1286)
@@ -135,3 +135,4 @@
regcomp_c.diff -p1
tst-setcontext_c.diff -p1
strfmon.diff
+argp_h.diff -p1
Reply to: