Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-musl-libc: Commit

external/musl/libc


Commit MetaInfo

Revision05eb8ea0607d8886b95e083abd10c5122b475a1a (tree)
Time2019-07-11 06:09:49
AuthorSamuel Holland <samuel@shol...>
CommiterRich Felker

Log Message

fix conflicting mips and powerpc definitions for TIOCSER_TEMT macro

Commit 3517d74a5e04a377192d1f4882ad6c8dc22ce69a changed the token in
sys/ioctl.h from 0x01 to 1, so bits/termios.h no longer matches. Revert
the bits/termios.h change to keep the headers in sync.

This reverts commit 9eda4dc69c33852c97c6f69176bf45ffc80b522f.

Change Summary

Incremental Difference

--- a/arch/mips/bits/termios.h
+++ b/arch/mips/bits/termios.h
@@ -165,5 +165,5 @@ struct termios {
165165 #define EXTPROC 0200000
166166
167167 #define XTABS 0014000
168-#define TIOCSER_TEMT 0x01
168+#define TIOCSER_TEMT 1
169169 #endif
--- a/arch/mips64/bits/termios.h
+++ b/arch/mips64/bits/termios.h
@@ -165,5 +165,5 @@ struct termios {
165165 #define EXTPROC 0200000
166166
167167 #define XTABS 0014000
168-#define TIOCSER_TEMT 0x01
168+#define TIOCSER_TEMT 1
169169 #endif
--- a/arch/mipsn32/bits/termios.h
+++ b/arch/mipsn32/bits/termios.h
@@ -165,5 +165,5 @@ struct termios {
165165 #define EXTPROC 0200000
166166
167167 #define XTABS 0014000
168-#define TIOCSER_TEMT 0x01
168+#define TIOCSER_TEMT 1
169169 #endif
--- a/arch/powerpc/bits/termios.h
+++ b/arch/powerpc/bits/termios.h
@@ -167,5 +167,5 @@ struct termios {
167167 #define EXTPROC 0x10000000
168168
169169 #define XTABS 00006000
170-#define TIOCSER_TEMT 0x01
170+#define TIOCSER_TEMT 1
171171 #endif
--- a/arch/powerpc64/bits/termios.h
+++ b/arch/powerpc64/bits/termios.h
@@ -167,5 +167,5 @@ struct termios {
167167 #define EXTPROC 0x10000000
168168
169169 #define XTABS 00006000
170-#define TIOCSER_TEMT 0x01
170+#define TIOCSER_TEMT 1
171171 #endif
Show on old repository browser