[Glibc-bsd-commits] r4146 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-03-16 23:02:44 +0000 (Fri, 16 Mar 2012)
New Revision: 4146

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/cdefs_macros.diff
Log:
cdefs_macros.diff: Also fix __va_list in <sys/sbuf.h>.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-03-11 14:18:26 UTC (rev 4145)
+++ trunk/freebsd-libs/debian/changelog	2012-03-16 23:02:44 UTC (rev 4146)
@@ -2,8 +2,9 @@
 
   * kvm.h: Use <bsd/nlist.h> rather than <nlist.h>. (Closes: #657772)
   * Remove redundant definitions of bsfq() and bsfl().
+  * cdefs_macros.diff: Also fix __va_list in <sys/sbuf.h>.
 
- -- Robert Millan <rmh at debian.org>  Sun, 26 Feb 2012 12:26:21 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 17 Mar 2012 00:02:38 +0100
 
 freebsd-libs (9.0+ds1-1) unstable; urgency=low
 

Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2012-03-11 14:18:26 UTC (rev 4145)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2012-03-16 23:02:44 UTC (rev 4146)
@@ -148,9 +148,10 @@
  int		 sbuf_cpy(struct sbuf *, const char *);
  int		 sbuf_printf(struct sbuf *, const char *, ...)
 -	__printflike(2, 3);
+-int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
+-	__printflike(2, 0);
 +	__attribute((format(printf, (2), (3))));
- int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
--	__printflike(2, 0);
++int		 sbuf_vprintf(struct sbuf *, const char *, va_list)
 +	__attribute((format(printf, (2), (0))));
  int		 sbuf_putc(struct sbuf *, int);
  void		 sbuf_set_drain(struct sbuf *, sbuf_drain_func *, void *);