Skip to content

Commit f1d09cd

Browse files
author
git apple-llvm automerger
committed
Merge commit 'd8752671e825' from llvm.org/release/19.x into stable/20240723
2 parents 6c40897 + d875267 commit f1d09cd

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111

1212
// Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment.
1313
#undef _FILE_OFFSET_BITS
14+
15+
// Avoid conflict between `_TIME_BITS` defined vs. `_FILE_OFFSET_BITS`
16+
// undefined in some Linux configurations.
17+
#undef _TIME_BITS
1418
#include "sanitizer_platform.h"
1519
#if SANITIZER_SOLARIS
1620
# include <fcntl.h>

0 commit comments

Comments
 (0)