[Glibc-bsd-commits] r4460 - trunk/kfreebsd-kernel-headers/debian

[Guillem Jover]

Author: guillem
Date: 2013-05-18 20:09:01 +0000 (Sat, 18 May 2013)
New Revision: 4460

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Merge kfreebsd-kernel-headers 0.83 from wheezy branch


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-05-18 19:43:48 UTC (rev 4459)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-05-18 20:09:01 UTC (rev 4460)
@@ -6,6 +6,14 @@
 
  -- Robert Millan <rmh at debian.org>  Fri, 17 Aug 2012 13:08:05 +0200
 
+kfreebsd-kernel-headers (0.83) unstable; urgency=low
+
+  * Include <sys/termios.h> instead of <sys/_termios.h> from <sys/tty.h>
+    so that code including both does not fail to build due to redefinition
+    of struct termios. (Closes: #700027)
+
+ -- Guillem Jover <guillem at debian.org>  Thu, 07 Mar 2013 04:41:12 +0100
+
 kfreebsd-kernel-headers (0.82) unstable; urgency=low
 
   * Convert __GNUCLIKE* feature tests into __GNUC__.  (Closes: #677417)

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2013-05-18 19:43:48 UTC (rev 4459)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2013-05-18 20:09:01 UTC (rev 4460)
@@ -77,6 +77,7 @@
 		-e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <sys\/kern\/time.h>/g' \
 		-e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <sys\/kern\/param.h>/g' \
 		-e 's/#\s*include\s\+<sys\/queue\.h>\s*/#include <sys\/kern\/queue.h>/g' \
+		-e 's/#\s*include\s\+<sys\/_termios\.h>\s*/#include <sys\/termios.h>/g' \
 		\
 		-e 's/__size_t/__this_is_a_temporary_kludge__size_t/g' $(shell ## see rev 184135 in GCC SVN ##) \
 	; done) ; \