Fix MIPS TIOCSER_TEMT namespace (bug 17782).

sysdeps/unix/sysv/linux/mips/bits/termios.h defines TIOCSER_TEMT
unconditionally, but it's in the user's namespace.  This patch
conditions it on __USE_MISC, as on powerpc.  I've filed bug 17783 for
the residual inconsistency in conditions on this macro (sparc defines
it for __USE_GNU only).

	[BZ #17782]
	* sysdeps/unix/sysv/linux/mips/bits/termios.h (TIOCSER_TEMT):
	Condition macro definition on [__USE_MISC].

diff --git a/ChangeLog b/ChangeLog
index 6ba384029b074090285083b186a3589d3473cf53..eb1909d4374059d0f87e9f0593fd02b9a9efa47c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-02  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #17782]
+       * sysdeps/unix/sysv/linux/mips/bits/termios.h (TIOCSER_TEMT):
+       Condition macro definition on [__USE_MISC].
+
        [BZ #17781]
        * sysdeps/unix/sysv/linux/mips/bits/sigaction.h
        (struct sigaction): Change type of sa_flags field to int.

diff --git a/NEWS b/NEWS
index 258318f8a5a71ebbbbf1ab8b366aab035f58c71a..4d90c8581cc852a0bc834279273770e570db02e7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.21
   17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633,
   17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719,
   17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747,
-  17775, 17780, 17781
+  17775, 17780, 17781, 17782
 
 * i386 memcpy functions optimized with SSE2 unaligned load/store.
 

diff --git a/sysdeps/unix/sysv/linux/mips/bits/termios.h b/sysdeps/unix/sysv/linux/mips/bits/termios.h
index 8f640e1c27259974442afe14bc50c2dca5594b3b..666d6a32c4a6fe35c149e9c1ab583918819178e7 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/termios.h
@@ -197,8 +197,10 @@ struct termios
 # define EXTPROC 0200000
 #endif
 
+#ifdef __USE_MISC
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-#define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
+# define TIOCSER_TEMT    0x01  /* Transmitter physically empty */
+#endif
 
 /* tcflow() and TCXONC use these */
 #define        TCOOFF          0       /* Suspend output.  */