Author: sthibault
Date: 2009-09-28 18:54:17 +0000 (Mon, 28 Sep 2009)
New Revision: 3856

Added:
   
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/cvs-termios-IXANY.patch
Removed:
   
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-termios-IXANY.patch
Modified:
   glibc-package/branches/eglibc-2.10/debian/changelog
   glibc-package/branches/eglibc-2.10/debian/patches/series
Log:
submitted-termios-IXANY.patch applied upstream


Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-28 18:53:23 UTC 
(rev 3855)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-28 18:54:17 UTC 
(rev 3856)
@@ -160,7 +160,7 @@
     crash.
   * debian/patches/hurd-i386/submitted-readlinkat.diff: New patch to add
     support for readlinkat(), to fix insserv build.
-  * debian/patches/hurd-i386/submitted-termios-IXANY.patch: New patch to
+  * debian/patches/hurd-i386/cvs-termios-IXANY.patch: New patch to
     define IXANY in XOpen environment too, to fix libgphoto2 build.
   * debian/patches/hurd-i386/submitted-SOL_IP.patch: New patch to add SOL_IP
     definition, to fix directfb build.

Copied: 
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/cvs-termios-IXANY.patch
 (from rev 3850, 
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-termios-IXANY.patch)
===================================================================
--- 
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/cvs-termios-IXANY.patch
                         (rev 0)
+++ 
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/cvs-termios-IXANY.patch
 2009-09-28 18:54:17 UTC (rev 3856)
@@ -0,0 +1,20 @@
+2009-09-28  Samuel Thibault  <[email protected]>
+
+       * bits/termios.h [__USE_UNIX98] (IXANY): Define macro.
+
+diff --git a/bits/termios.h b/bits/termios.h
+index 293d0a6..b697dd1 100644
+--- a/bits/termios.h
++++ b/bits/termios.h
+@@ -124,8 +124,10 @@ struct termios
+ #define       ICRNL   (1 << 8)        /* Map CR to NL on input.  */
+ #define       IXON    (1 << 9)        /* Enable start/stop output control.  */
+ #define       IXOFF   (1 << 10)       /* Enable start/stop input control.  */
+-#ifdef        __USE_BSD
++#if defined __USE_BSD || defined __USE_UNIX98
+ # define IXANY        (1 << 11)       /* Any character will restart after 
stop.  */
++#endif
++#ifdef        __USE_BSD
+ # define IMAXBEL (1 << 13)    /* Ring bell when input queue is full.  */
+ #endif
+ #ifdef __USE_GNU

Deleted: 
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-termios-IXANY.patch
===================================================================
--- 
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-termios-IXANY.patch
   2009-09-28 18:53:23 UTC (rev 3855)
+++ 
glibc-package/branches/eglibc-2.10/debian/patches/hurd-i386/submitted-termios-IXANY.patch
   2009-09-28 18:54:17 UTC (rev 3856)
@@ -1,20 +0,0 @@
-2009-09-28  Samuel Thibault  <[email protected]>
-
-       * bits/termios.h [__USE_UNIX98] (IXANY): Define macro.
-
-diff --git a/bits/termios.h b/bits/termios.h
-index 293d0a6..b697dd1 100644
---- a/bits/termios.h
-+++ b/bits/termios.h
-@@ -124,8 +124,10 @@ struct termios
- #define       ICRNL   (1 << 8)        /* Map CR to NL on input.  */
- #define       IXON    (1 << 9)        /* Enable start/stop output control.  */
- #define       IXOFF   (1 << 10)       /* Enable start/stop input control.  */
--#ifdef        __USE_BSD
-+#if defined __USE_BSD || defined __USE_UNIX98
- # define IXANY        (1 << 11)       /* Any character will restart after 
stop.  */
-+#endif
-+#ifdef        __USE_BSD
- # define IMAXBEL (1 << 13)    /* Ring bell when input queue is full.  */
- #endif
- #ifdef __USE_GNU

Modified: glibc-package/branches/eglibc-2.10/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/series    2009-09-28 
18:53:23 UTC (rev 3855)
+++ glibc-package/branches/eglibc-2.10/debian/patches/series    2009-09-28 
18:54:17 UTC (rev 3856)
@@ -103,7 +103,7 @@
 hurd-i386/submitted-sbrk.diff
 hurd-i386/local-thread-cancel.diff
 hurd-i386/submitted-readlinkat.diff
-hurd-i386/submitted-termios-IXANY.patch
+hurd-i386/cvs-termios-IXANY.patch
 hurd-i386/submitted-SOL_IP.patch
 
 ia64/submitted-sysconf.diff


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to