[Glibc-bsd-commits] r4383 - branches/wheezy/kfreebsd-kernel-headers/debian

[Guillem Jover]

Author: guillem
Date: 2013-03-07 03:40:30 +0000 (Thu, 07 Mar 2013)
New Revision: 4383

Modified:
   branches/wheezy/kfreebsd-kernel-headers/debian/changelog
   branches/wheezy/kfreebsd-kernel-headers/debian/rules
Log:
Fix build failures due to redefinition of struct termios

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)


Modified: branches/wheezy/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- branches/wheezy/kfreebsd-kernel-headers/debian/changelog	2013-03-07 03:09:13 UTC (rev 4382)
+++ branches/wheezy/kfreebsd-kernel-headers/debian/changelog	2013-03-07 03:40:30 UTC (rev 4383)
@@ -1,3 +1,11 @@
+kfreebsd-kernel-headers (0.83) UNRELEASED; 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:18:47 +0100
+
 kfreebsd-kernel-headers (0.82) unstable; urgency=low
 
   * Convert __GNUCLIKE* feature tests into __GNUC__.  (Closes: #677417)

Modified: branches/wheezy/kfreebsd-kernel-headers/debian/rules
===================================================================
--- branches/wheezy/kfreebsd-kernel-headers/debian/rules	2013-03-07 03:09:13 UTC (rev 4382)
+++ branches/wheezy/kfreebsd-kernel-headers/debian/rules	2013-03-07 03:40:30 UTC (rev 4383)
@@ -75,6 +75,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) ; \