[Glibc-bsd-commits] r2838 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-11-14 09:51:20 +0000 (Sat, 14 Nov 2009)
New Revision: 2838

Modified:
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
   trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
Log:
header fixes for freebsd-libs



Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2009-11-14 05:45:27 UTC (rev 2837)
+++ trunk/kfreebsd-kernel-headers/debian/install	2009-11-14 09:51:20 UTC (rev 2838)
@@ -82,6 +82,7 @@
 sys/net/raw_cb.h                        usr/include/net
 sys/net/route.h                         usr/include/net
 sys/net/slcompress.h                    usr/include/net
+sys/net/vnet.h                          usr/include/net
 sys/net/zlib.h                          usr/include/net
 sys/netatalk/aarp.h                     usr/include/netatalk
 sys/netatalk/at_extern.h                usr/include/netatalk
@@ -271,6 +272,7 @@
 sys/sys/timex.h                         usr/include/sys
 sys/sys/tree.h                          usr/include/sys
 sys/sys/ttycom.h                        usr/include/sys
+sys/sys/ttyqueue.h                      usr/include/sys
 sys/sys/tty.h                           usr/include/sys
 sys/sys/_types.h                        usr/include/sys
 sys/sys/ucred.h                         usr/include/sys

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2009-11-14 05:45:27 UTC (rev 2837)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2009-11-14 09:51:20 UTC (rev 2838)
@@ -249,8 +249,8 @@
  #endif
  
 +#include <features.h>
-+
 +#include <sys/types.h>
++#include <sys/_types.h>
 +
  struct jail {
  	uint32_t	version;

Modified: trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff	2009-11-14 05:45:27 UTC (rev 2837)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff	2009-11-14 09:51:20 UTC (rev 2838)
@@ -1,13 +1,15 @@
 diff -Nur sys/osreldate.h sys/osreldate.h
 --- src/sys/osreldate.h
 +++ src/sys/osreldate.h
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,14 @@
 +
 +/* kFreeBSD 8.0 headers */
 +
 +#include <sys/cdefs.h>
 +#ifndef _SYS_CDEFS_H_
 +#define _SYS_CDEFS_H_
++#define __XSTRING(x)    __STRING(x)     /* expand x, then stringify */
++#define __aligned(x)    __attribute__((__aligned__(x)))
 +#endif
 +
 +#undef __FreeBSD_kernel__

Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff	2009-11-14 05:45:27 UTC (rev 2837)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff	2009-11-14 09:51:20 UTC (rev 2838)
@@ -19,3 +19,14 @@
  /*
   * Prototypes and definitions for BSD/OS-compatible network interface
   * media selection.
+--- src/sys/dev/usb/usb_endian.h~
++++ src/sys/dev/usb/usb_endian.h
+@@ -27,7 +27,7 @@
+ #ifndef _USB_ENDIAN_H_
+ #define	_USB_ENDIAN_H_
+ 
+-#include <sys/stdint.h>
++#include <stdint.h>
+ #include <sys/endian.h>
+ 
+ /*