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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-06 00:23:10 +0000 (Sun, 06 Mar 2016)
New Revision: 5928

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/subr_prf.diff
Log:
Add missing patch hunk


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2016-03-05 22:09:51 UTC (rev 5927)
+++ trunk/freebsd-libs/debian/changelog	2016-03-06 00:23:10 UTC (rev 5928)
@@ -1,3 +1,10 @@
+freebsd-libs (10.3~svn296373-3) UNRELEASED; urgency=medium
+
+  * Add missing patch hunk
+      - subr_prf.diff
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 06 Mar 2016 00:22:15 +0000
+
 freebsd-libs (10.3~svn296373-2) experimental; urgency=medium
 
   * Avoid including kernel headers on non-kfreebsd arches,

Modified: trunk/freebsd-libs/debian/patches/subr_prf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/subr_prf.diff	2016-03-05 22:09:51 UTC (rev 5927)
+++ trunk/freebsd-libs/debian/patches/subr_prf.diff	2016-03-06 00:23:10 UTC (rev 5928)
@@ -1,6 +1,6 @@
 --- a/sys/kern/subr_prf.c
 +++ b/sys/kern/subr_prf.c
-@@ -60,8 +60,8 @@
+@@ -60,22 +60,22 @@
  #include <sys/syslog.h>
  #include <sys/cons.h>
  #include <sys/uio.h>
@@ -10,3 +10,19 @@
  #include <sys/sbuf.h>
  
  #ifdef DDB
+ #include <ddb/ddb.h>
+ #endif
+ 
++#ifdef _KERNEL
++
+ /*
+  * Note that stdarg.h and the ANSI style va_start macro is used for both
+  * ANSI and traditional C compilers.
+  */
+ #include <machine/stdarg.h>
+ 
+-#ifdef _KERNEL
+-
+ #define TOCONS	0x01
+ #define TOTTY	0x02
+ #define TOLOG	0x04