Author: sthibaul-guest
Date: 2008-05-22 23:54:27 +0000 (Thu, 22 May 2008)
New Revision: 2954
Removed:
glibc-package/trunk/debian/patches/hurd-i386/submitted-termios-ONLCR.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff
glibc-package/trunk/debian/patches/series
Log:
the ONLCR fix got applied upstream
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-05-21 14:02:17 UTC (rev
2953)
+++ glibc-package/trunk/debian/changelog 2008-05-22 23:54:27 UTC (rev
2954)
@@ -11,8 +11,7 @@
closes: #475474.
[ Samuel Thibault ]
- * patches/hurd-i386/submitted-termios-ONLCR.diff: new patch to fix
- compilation of jove.
+ * patches/hurd-i386/cvs-termios.diff: update patch, fixes compilation of
jove.
-- Clint Adams <[EMAIL PROTECTED]> Sun, 18 May 2008 07:42:57 -0400
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff
2008-05-21 14:02:17 UTC (rev 2953)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff
2008-05-22 23:54:27 UTC (rev 2954)
@@ -57,11 +57,16 @@
#ifdef __USE_BSD
# ifdef MDMBUF
-@@ -93,11 +137,43 @@ struct termios
+@@ -91,13 +135,47 @@ struct termios
+ /* Output modes. */
+ tcflag_t c_oflag;
#define OPOST (1 << 0) /* Perform output processing. */
- #ifdef __USE_BSD
+-#ifdef __USE_BSD
++#if defined __USE_BSD || defined __USE_XOPEN
# define ONLCR (1 << 1) /* Map NL to CR-NL on output. */
-# define OXTABS (1 << 2) /* Expand tabs to spaces. */
++#endif
++#ifdef __USE_BSD
+# define OXTABS TAB3 /* Expand tabs to spaces. */
# define ONOEOT (1 << 3) /* Discard EOT (^D) on output. */
#endif
@@ -103,7 +108,7 @@
#endif
/* Control modes. */
-@@ -117,10 +193,12 @@ struct termios
+@@ -117,10 +195,12 @@ struct termios
#define HUPCL (1 << 14) /* Hang up on last close. */
#define CLOCAL (1 << 15) /* Ignore modem status lines. */
#ifdef __USE_BSD
@@ -120,7 +125,7 @@
#endif
/* Local modes. */
-@@ -210,13 +288,17 @@ struct termios
+@@ -210,13 +290,17 @@ struct termios
#define B2400 2400 /* 2400 baud. */
#define B4800 4800 /* 4800 baud. */
#define B9600 9600 /* 9600 baud. */
Deleted:
glibc-package/trunk/debian/patches/hurd-i386/submitted-termios-ONLCR.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-termios-ONLCR.diff
2008-05-21 14:02:17 UTC (rev 2953)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-termios-ONLCR.diff
2008-05-22 23:54:27 UTC (rev 2954)
@@ -1,23 +0,0 @@
-2008-05-21 Samuel Thibault <[EMAIL PROTECTED]>
-
- * bits/termios.h (ONLCR): Define on __USE_XOPEN too.
-
-Index: bits/termios.h
-===================================================================
-RCS file: /cvs/glibc/libc/bits/termios.h,v
-retrieving revision 1.8
-diff -u -p -r1.8 termios.h
---- bits/termios.h 5 May 2008 23:06:01 -0000 1.8
-+++ bits/termios.h 21 May 2008 10:35:51 -0000
-@@ -135,8 +135,10 @@ struct termios
- /* Output modes. */
- tcflag_t c_oflag;
- #define OPOST (1 << 0) /* Perform output processing. */
--#ifdef __USE_BSD
-+#if defined __USE_BSD || defined __USE_XOPEN
- # define ONLCR (1 << 1) /* Map NL to CR-NL on output. */
-+#endif
-+#ifdef __USE_BSD
- # define OXTABS TAB3 /* Expand tabs to spaces. */
- # define ONOEOT (1 << 3) /* Discard EOT (^D) on output. */
- #endif
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-05-21 14:02:17 UTC (rev
2953)
+++ glibc-package/trunk/debian/patches/series 2008-05-22 23:54:27 UTC (rev
2954)
@@ -100,7 +100,6 @@
hurd-i386/cvs-df.diff
hurd-i386/cvs-blocked-exceptions.diff
hurd-i386/cvs-termios.diff
-hurd-i386/submitted-termios-ONLCR.diff -p0
i386/cvs-short-for-fnstsw.diff -p1
i386/local-biarch.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
