diff --git a/libc/calls/ttydefaults.h b/libc/calls/ttydefaults.h index e17a31c34..6fc8e3877 100644 --- a/libc/calls/ttydefaults.h +++ b/libc/calls/ttydefaults.h @@ -7,7 +7,7 @@ #define TTYDEF_OFLAG (OPOST | ONLCR | XTABS) #define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE | ECHOKE | ECHOCTL) #define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) -#define TTYDEF_SPEED (B9600) +#define TTYDEF_SPEED (__B9600) #define CTRL(x) ((x) ^ 0100) #define CEOF CTRL('D') diff --git a/libc/sysv/consts/B0.S b/libc/sysv/consts/B0.S index 10c881343..0629d0223 100644 --- a/libc/sysv/consts/B0.S +++ b/libc/sysv/consts/B0.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B0,0,0,0,0,0,0 +.syscon baud,__B0,0,0,0,0,0,0 diff --git a/libc/sysv/consts/B1000000.S b/libc/sysv/consts/B1000000.S index a9df538cc..8cec8abca 100644 --- a/libc/sysv/consts/B1000000.S +++ b/libc/sysv/consts/B1000000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B1000000,0x1008,0,0,0,0,0 +.syscon baud,__B1000000,0x1008,0,0,0,0,0 diff --git a/libc/sysv/consts/B110.S b/libc/sysv/consts/B110.S index f881e71c4..28c4738a0 100644 --- a/libc/sysv/consts/B110.S +++ b/libc/sysv/consts/B110.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B110,3,110,110,110,110,0 +.syscon baud,__B110,3,110,110,110,110,0 diff --git a/libc/sysv/consts/B115200.S b/libc/sysv/consts/B115200.S index 03754110b..d6e0ca47d 100644 --- a/libc/sysv/consts/B115200.S +++ b/libc/sysv/consts/B115200.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B115200,0x1002,0x01c200,0x01c200,0x01c200,0x01c200,0 +.syscon baud,__B115200,0x1002,0x01c200,0x01c200,0x01c200,0x01c200,0 diff --git a/libc/sysv/consts/B1152000.S b/libc/sysv/consts/B1152000.S index a51390a4e..6816daae6 100644 --- a/libc/sysv/consts/B1152000.S +++ b/libc/sysv/consts/B1152000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B1152000,0x1009,0,0,0,0,0 +.syscon baud,__B1152000,0x1009,0,0,0,0,0 diff --git a/libc/sysv/consts/B1200.S b/libc/sysv/consts/B1200.S index 4aadfb7fa..2ed8db826 100644 --- a/libc/sysv/consts/B1200.S +++ b/libc/sysv/consts/B1200.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B1200,9,0x04b0,0x04b0,0x04b0,0x04b0,0 +.syscon baud,__B1200,9,0x04b0,0x04b0,0x04b0,0x04b0,0 diff --git a/libc/sysv/consts/B134.S b/libc/sysv/consts/B134.S index 72abd7770..81937a1ea 100644 --- a/libc/sysv/consts/B134.S +++ b/libc/sysv/consts/B134.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B134,4,134,134,134,134,0 +.syscon baud,__B134,4,134,134,134,134,0 diff --git a/libc/sysv/consts/B150.S b/libc/sysv/consts/B150.S index e4551c9cf..b4bb4153c 100644 --- a/libc/sysv/consts/B150.S +++ b/libc/sysv/consts/B150.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B150,5,150,150,150,150,0 +.syscon baud,__B150,5,150,150,150,150,0 diff --git a/libc/sysv/consts/B1500000.S b/libc/sysv/consts/B1500000.S index de0391547..5f6e66e8d 100644 --- a/libc/sysv/consts/B1500000.S +++ b/libc/sysv/consts/B1500000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B1500000,0x100a,0,0,0,0,0 +.syscon baud,__B1500000,0x100a,0,0,0,0,0 diff --git a/libc/sysv/consts/B1800.S b/libc/sysv/consts/B1800.S index 594d187ac..a0b097621 100644 --- a/libc/sysv/consts/B1800.S +++ b/libc/sysv/consts/B1800.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B1800,10,0x0708,0x0708,0x0708,0x0708,0 +.syscon baud,__B1800,10,0x0708,0x0708,0x0708,0x0708,0 diff --git a/libc/sysv/consts/B19200.S b/libc/sysv/consts/B19200.S index 1f1a7dbf9..82e55a190 100644 --- a/libc/sysv/consts/B19200.S +++ b/libc/sysv/consts/B19200.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B19200,14,0x4b00,0x4b00,0x4b00,0x4b00,0 +.syscon baud,__B19200,14,0x4b00,0x4b00,0x4b00,0x4b00,0 diff --git a/libc/sysv/consts/B200.S b/libc/sysv/consts/B200.S index e0f2164d5..2a28ba635 100644 --- a/libc/sysv/consts/B200.S +++ b/libc/sysv/consts/B200.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B200,6,200,200,200,200,0 +.syscon baud,__B200,6,200,200,200,200,0 diff --git a/libc/sysv/consts/B2000000.S b/libc/sysv/consts/B2000000.S index 1669832a1..bfd374c02 100644 --- a/libc/sysv/consts/B2000000.S +++ b/libc/sysv/consts/B2000000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B2000000,0x100b,0,0,0,0,0 +.syscon baud,__B2000000,0x100b,0,0,0,0,0 diff --git a/libc/sysv/consts/B230400.S b/libc/sysv/consts/B230400.S index c44512297..0aa7c15e1 100644 --- a/libc/sysv/consts/B230400.S +++ b/libc/sysv/consts/B230400.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B230400,0x1003,0x038400,0x038400,0x038400,0x038400,0 +.syscon baud,__B230400,0x1003,0x038400,0x038400,0x038400,0x038400,0 diff --git a/libc/sysv/consts/B2400.S b/libc/sysv/consts/B2400.S index 5ba9c3019..edb4a68f9 100644 --- a/libc/sysv/consts/B2400.S +++ b/libc/sysv/consts/B2400.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B2400,11,0x0960,0x0960,0x0960,0x0960,0 +.syscon baud,__B2400,11,0x0960,0x0960,0x0960,0x0960,0 diff --git a/libc/sysv/consts/B2500000.S b/libc/sysv/consts/B2500000.S index 398957ecb..c1ab2403b 100644 --- a/libc/sysv/consts/B2500000.S +++ b/libc/sysv/consts/B2500000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B2500000,0x100c,0,0,0,0,0 +.syscon baud,__B2500000,0x100c,0,0,0,0,0 diff --git a/libc/sysv/consts/B300.S b/libc/sysv/consts/B300.S index 4eb78fd3b..cae762874 100644 --- a/libc/sysv/consts/B300.S +++ b/libc/sysv/consts/B300.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B300,7,300,300,300,300,0 +.syscon baud,__B300,7,300,300,300,300,0 diff --git a/libc/sysv/consts/B3000000.S b/libc/sysv/consts/B3000000.S index 46aa04775..c066983fb 100644 --- a/libc/sysv/consts/B3000000.S +++ b/libc/sysv/consts/B3000000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B3000000,0x100d,0,0,0,0,0 +.syscon baud,__B3000000,0x100d,0,0,0,0,0 diff --git a/libc/sysv/consts/B3500000.S b/libc/sysv/consts/B3500000.S index c4a88b813..e2bcd6f56 100644 --- a/libc/sysv/consts/B3500000.S +++ b/libc/sysv/consts/B3500000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B3500000,0x100e,0,0,0,0,0 +.syscon baud,__B3500000,0x100e,0,0,0,0,0 diff --git a/libc/sysv/consts/B38400.S b/libc/sysv/consts/B38400.S index 2b89d8327..1c74b7c45 100644 --- a/libc/sysv/consts/B38400.S +++ b/libc/sysv/consts/B38400.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B38400,15,0x9600,0x9600,0x9600,0x9600,0 +.syscon baud,__B38400,15,0x9600,0x9600,0x9600,0x9600,0 diff --git a/libc/sysv/consts/B4000000.S b/libc/sysv/consts/B4000000.S index 53d35ce59..d1afa46f5 100644 --- a/libc/sysv/consts/B4000000.S +++ b/libc/sysv/consts/B4000000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B4000000,0x100f,0,0,0,0,0 +.syscon baud,__B4000000,0x100f,0,0,0,0,0 diff --git a/libc/sysv/consts/B4800.S b/libc/sysv/consts/B4800.S index 3ec42ec1c..310dc96d4 100644 --- a/libc/sysv/consts/B4800.S +++ b/libc/sysv/consts/B4800.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B4800,12,0x12c0,0x12c0,0x12c0,0x12c0,0 +.syscon baud,__B4800,12,0x12c0,0x12c0,0x12c0,0x12c0,0 diff --git a/libc/sysv/consts/B50.S b/libc/sysv/consts/B50.S index f226f4ac5..660ef7742 100644 --- a/libc/sysv/consts/B50.S +++ b/libc/sysv/consts/B50.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B50,1,50,50,50,50,0 +.syscon baud,__B50,1,50,50,50,50,0 diff --git a/libc/sysv/consts/B500000.S b/libc/sysv/consts/B500000.S index ce55ea22f..a46fcabcd 100644 --- a/libc/sysv/consts/B500000.S +++ b/libc/sysv/consts/B500000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B500000,0x1005,0,0,0,0,0 +.syscon baud,__B500000,0x1005,0,0,0,0,0 diff --git a/libc/sysv/consts/B57600.S b/libc/sysv/consts/B57600.S index c24db80ed..1dc1ccfde 100644 --- a/libc/sysv/consts/B57600.S +++ b/libc/sysv/consts/B57600.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B57600,0x1001,0xe100,0xe100,0xe100,0xe100,0 +.syscon baud,__B57600,0x1001,0xe100,0xe100,0xe100,0xe100,0 diff --git a/libc/sysv/consts/B576000.S b/libc/sysv/consts/B576000.S index 4e71a6635..444cebe1a 100644 --- a/libc/sysv/consts/B576000.S +++ b/libc/sysv/consts/B576000.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B576000,0x1006,0,0,0,0,0 +.syscon baud,__B576000,0x1006,0,0,0,0,0 diff --git a/libc/sysv/consts/B600.S b/libc/sysv/consts/B600.S index 86ae31586..0dcb05cf6 100644 --- a/libc/sysv/consts/B600.S +++ b/libc/sysv/consts/B600.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B600,8,600,600,600,600,0 +.syscon baud,__B600,8,600,600,600,600,0 diff --git a/libc/sysv/consts/B75.S b/libc/sysv/consts/B75.S index 0935d33ad..094e2876e 100644 --- a/libc/sysv/consts/B75.S +++ b/libc/sysv/consts/B75.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B75,2,75,75,75,75,0 +.syscon baud,__B75,2,75,75,75,75,0 diff --git a/libc/sysv/consts/B9600.S b/libc/sysv/consts/B9600.S index 47bc775bd..90d347c9d 100644 --- a/libc/sysv/consts/B9600.S +++ b/libc/sysv/consts/B9600.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon baud,B9600,13,0x2580,0x2580,0x2580,0x2580,0 +.syscon baud,__B9600,13,0x2580,0x2580,0x2580,0x2580,0 diff --git a/libc/sysv/consts/baud.h b/libc/sysv/consts/baud.h index d4e2e8326..bb0feeb88 100644 --- a/libc/sysv/consts/baud.h +++ b/libc/sysv/consts/baud.h @@ -4,67 +4,67 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -extern const long B0; -extern const long B50; -extern const long B75; -extern const long B110; -extern const long B134; -extern const long B150; -extern const long B200; -extern const long B300; -extern const long B600; -extern const long B1200; -extern const long B1800; -extern const long B2400; -extern const long B4800; -extern const long B9600; -extern const long B19200; -extern const long B38400; -extern const long B57600; -extern const long B115200; -extern const long B230400; -extern const long B500000; -extern const long B576000; -extern const long B1000000; -extern const long B1152000; -extern const long B1500000; -extern const long B2000000; -extern const long B2500000; -extern const long B3000000; -extern const long B3500000; -extern const long B4000000; +extern const long __B0; +extern const long __B50; +extern const long __B75; +extern const long __B110; +extern const long __B134; +extern const long __B150; +extern const long __B200; +extern const long __B300; +extern const long __B600; +extern const long __B1200; +extern const long __B1800; +extern const long __B2400; +extern const long __B4800; +extern const long __B9600; +extern const long __B19200; +extern const long __B38400; +extern const long __B57600; +extern const long __B115200; +extern const long __B230400; +extern const long __B500000; +extern const long __B576000; +extern const long __B1000000; +extern const long __B1152000; +extern const long __B1500000; +extern const long __B2000000; +extern const long __B2500000; +extern const long __B3000000; +extern const long __B3500000; +extern const long __B4000000; COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#define B0 LITERALLY(0) -#define B50 SYMBOLIC(B50) -#define B75 SYMBOLIC(B75) -#define B110 SYMBOLIC(B110) -#define B134 SYMBOLIC(B134) -#define B150 SYMBOLIC(B150) -#define B200 SYMBOLIC(B200) -#define B300 SYMBOLIC(B300) -#define B600 SYMBOLIC(B600) -#define B1200 SYMBOLIC(B1200) -#define B1800 SYMBOLIC(B1800) -#define B2400 SYMBOLIC(B2400) -#define B4800 SYMBOLIC(B4800) -#define B9600 SYMBOLIC(B9600) -#define B19200 SYMBOLIC(B19200) -#define B38400 SYMBOLIC(B38400) -#define B57600 SYMBOLIC(B57600) -#define B115200 SYMBOLIC(B115200) -#define B230400 SYMBOLIC(B230400) -#define B500000 SYMBOLIC(B500000) -#define B576000 SYMBOLIC(B576000) -#define B1000000 SYMBOLIC(B1000000) -#define B1152000 SYMBOLIC(B1152000) -#define B1500000 SYMBOLIC(B1500000) -#define B2000000 SYMBOLIC(B2000000) -#define B2500000 SYMBOLIC(B2500000) -#define B3000000 SYMBOLIC(B3000000) -#define B3500000 SYMBOLIC(B3500000) -#define B4000000 SYMBOLIC(B4000000) +#define __B0 LITERALLY(0) +#define __B50 SYMBOLIC(__B50) +#define __B75 SYMBOLIC(__B75) +#define __B110 SYMBOLIC(__B110) +#define __B134 SYMBOLIC(__B134) +#define __B150 SYMBOLIC(__B150) +#define __B200 SYMBOLIC(__B200) +#define __B300 SYMBOLIC(__B300) +#define __B600 SYMBOLIC(__B600) +#define __B1200 SYMBOLIC(__B1200) +#define __B1800 SYMBOLIC(__B1800) +#define __B2400 SYMBOLIC(__B2400) +#define __B4800 SYMBOLIC(__B4800) +#define __B9600 SYMBOLIC(__B9600) +#define __B19200 SYMBOLIC(__B19200) +#define __B38400 SYMBOLIC(__B38400) +#define __B57600 SYMBOLIC(__B57600) +#define __B115200 SYMBOLIC(__B115200) +#define __B230400 SYMBOLIC(__B230400) +#define __B500000 SYMBOLIC(__B500000) +#define __B576000 SYMBOLIC(__B576000) +#define __B1000000 SYMBOLIC(__B1000000) +#define __B1152000 SYMBOLIC(__B1152000) +#define __B1500000 SYMBOLIC(__B1500000) +#define __B2000000 SYMBOLIC(__B2000000) +#define __B2500000 SYMBOLIC(__B2500000) +#define __B3000000 SYMBOLIC(__B3000000) +#define __B3500000 SYMBOLIC(__B3500000) +#define __B4000000 SYMBOLIC(__B4000000) #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_BAUD_H_ */ diff --git a/third_party/python/Modules/termios.c b/third_party/python/Modules/termios.c index 31a9a09ba..2bab06a72 100644 --- a/third_party/python/Modules/termios.c +++ b/third_party/python/Modules/termios.c @@ -545,34 +545,34 @@ PyInit_termios(void) Py_INCREF(TermiosError); PyModule_AddObject(m, "error", TermiosError); - if (B50) PyModule_AddIntConstant(m, "B50", B50); - if (B75) PyModule_AddIntConstant(m, "B75", B75); - if (B110) PyModule_AddIntConstant(m, "B110", B110); - if (B134) PyModule_AddIntConstant(m, "B134", B134); - if (B150) PyModule_AddIntConstant(m, "B150", B150); - if (B200) PyModule_AddIntConstant(m, "B200", B200); - if (B300) PyModule_AddIntConstant(m, "B300", B300); - if (B600) PyModule_AddIntConstant(m, "B600", B600); - if (B1200) PyModule_AddIntConstant(m, "B1200", B1200); - if (B1800) PyModule_AddIntConstant(m, "B1800", B1800); - if (B2400) PyModule_AddIntConstant(m, "B2400", B2400); - if (B4800) PyModule_AddIntConstant(m, "B4800", B4800); - if (B9600) PyModule_AddIntConstant(m, "B9600", B9600); - if (B19200) PyModule_AddIntConstant(m, "B19200", B19200); - if (B38400) PyModule_AddIntConstant(m, "B38400", B38400); - if (B57600) PyModule_AddIntConstant(m, "B57600", B57600); - if (B115200) PyModule_AddIntConstant(m, "B115200", B115200); - if (B230400) PyModule_AddIntConstant(m, "B230400", B230400); - if (B500000) PyModule_AddIntConstant(m, "B500000", B500000); - if (B576000) PyModule_AddIntConstant(m, "B576000", B576000); - if (B1000000) PyModule_AddIntConstant(m, "B1000000", B1000000); - if (B1152000) PyModule_AddIntConstant(m, "B1152000", B1152000); - if (B1500000) PyModule_AddIntConstant(m, "B1500000", B1500000); - if (B2000000) PyModule_AddIntConstant(m, "B2000000", B2000000); - if (B2500000) PyModule_AddIntConstant(m, "B2500000", B2500000); - if (B3000000) PyModule_AddIntConstant(m, "B3000000", B3000000); - if (B3500000) PyModule_AddIntConstant(m, "B3500000", B3500000); - if (B4000000) PyModule_AddIntConstant(m, "B4000000", B4000000); + if (__B50) PyModule_AddIntConstant(m, "B50", __B50); + if (__B75) PyModule_AddIntConstant(m, "B75", __B75); + if (__B110) PyModule_AddIntConstant(m, "B110", __B110); + if (__B134) PyModule_AddIntConstant(m, "B134", __B134); + if (__B150) PyModule_AddIntConstant(m, "B150", __B150); + if (__B200) PyModule_AddIntConstant(m, "B200", __B200); + if (__B300) PyModule_AddIntConstant(m, "B300", __B300); + if (__B600) PyModule_AddIntConstant(m, "B600", __B600); + if (__B1200) PyModule_AddIntConstant(m, "B1200", __B1200); + if (__B1800) PyModule_AddIntConstant(m, "B1800", __B1800); + if (__B2400) PyModule_AddIntConstant(m, "B2400", __B2400); + if (__B4800) PyModule_AddIntConstant(m, "B4800", __B4800); + if (__B9600) PyModule_AddIntConstant(m, "B9600", __B9600); + if (__B19200) PyModule_AddIntConstant(m, "B19200", __B19200); + if (__B38400) PyModule_AddIntConstant(m, "B38400", __B38400); + if (__B57600) PyModule_AddIntConstant(m, "B57600", __B57600); + if (__B115200) PyModule_AddIntConstant(m, "B115200", __B115200); + if (__B230400) PyModule_AddIntConstant(m, "B230400", __B230400); + if (__B500000) PyModule_AddIntConstant(m, "B500000", __B500000); + if (__B576000) PyModule_AddIntConstant(m, "B576000", __B576000); + if (__B1000000) PyModule_AddIntConstant(m, "B1000000", __B1000000); + if (__B1152000) PyModule_AddIntConstant(m, "B1152000", __B1152000); + if (__B1500000) PyModule_AddIntConstant(m, "B1500000", __B1500000); + if (__B2000000) PyModule_AddIntConstant(m, "B2000000", __B2000000); + if (__B2500000) PyModule_AddIntConstant(m, "B2500000", __B2500000); + if (__B3000000) PyModule_AddIntConstant(m, "B3000000", __B3000000); + if (__B3500000) PyModule_AddIntConstant(m, "B3500000", __B3500000); + if (__B4000000) PyModule_AddIntConstant(m, "B4000000", __B4000000); if (CBAUDEX) PyModule_AddIntConstant(m, "CBAUDEX", CBAUDEX); /* TODO(jart): B460800 */ /* TODO(jart): B921600 */