Skip to content

Commit 3aacc7e

Browse files
author
git apple-llvm automerger
committed
Merge commit '8d38ccbb5a43' from llvm.org/release/21.x into stable/21.x
2 parents 3d801aa + 8d38ccb commit 3aacc7e

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -779,15 +779,11 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
779779
unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER;
780780
#endif // SOUND_VERSION
781781
unsigned IOCTL_TCFLSH = TCFLSH;
782-
unsigned IOCTL_TCGETA = TCGETA;
783782
# if SANITIZER_TERMIOS_IOCTL_CONSTANTS
784783
unsigned IOCTL_TCGETS = TCGETS;
785784
# endif
786785
unsigned IOCTL_TCSBRK = TCSBRK;
787786
unsigned IOCTL_TCSBRKP = TCSBRKP;
788-
unsigned IOCTL_TCSETA = TCSETA;
789-
unsigned IOCTL_TCSETAF = TCSETAF;
790-
unsigned IOCTL_TCSETAW = TCSETAW;
791787
# if SANITIZER_TERMIOS_IOCTL_CONSTANTS
792788
unsigned IOCTL_TCSETS = TCSETS;
793789
unsigned IOCTL_TCSETSF = TCSETSF;

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,12 +1314,8 @@ extern unsigned IOCTL_SNDCTL_COPR_SENDMSG;
13141314
extern unsigned IOCTL_SNDCTL_COPR_WCODE;
13151315
extern unsigned IOCTL_SNDCTL_COPR_WDATA;
13161316
extern unsigned IOCTL_TCFLSH;
1317-
extern unsigned IOCTL_TCGETA;
13181317
extern unsigned IOCTL_TCSBRK;
13191318
extern unsigned IOCTL_TCSBRKP;
1320-
extern unsigned IOCTL_TCSETA;
1321-
extern unsigned IOCTL_TCSETAF;
1322-
extern unsigned IOCTL_TCSETAW;
13231319
# if SANITIZER_TERMIOS_IOCTL_CONSTANTS
13241320
extern unsigned IOCTL_TCGETS;
13251321
extern unsigned IOCTL_TCSETS;

0 commit comments

Comments
 (0)