summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2018-11-13 06:01:22 (GMT)
committerGitHub <noreply@github.com>2018-11-13 06:01:22 (GMT)
commit3015fb8ce4d25603434b9b44bb7effb98a481532 (patch)
treea76d3bbd890685a151c19b48bd5d8346eb7e7276 /Python
parent0dc1e45dfd242493ecdac5dbcad51dbc8f922de7 (diff)
downloadcpython-3015fb8ce4d25603434b9b44bb7effb98a481532.zip
cpython-3015fb8ce4d25603434b9b44bb7effb98a481532.tar.gz
cpython-3015fb8ce4d25603434b9b44bb7effb98a481532.tar.bz2
bpo-35214: Add _Py_ prefix to MEMORY_SANITIZER def. (GH-10503)
Rename our new MEMORY_SANITIZER define to _Py_MEMORY_SANITIZER. Project based C Preprocessor namespacing at its finest. :P
Diffstat (limited to 'Python')
-rw-r--r--Python/bootstrap_hash.c4
-rw-r--r--Python/pymath.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Python/bootstrap_hash.c b/Python/bootstrap_hash.c
index 1b8f9d9..793c646 100644
--- a/Python/bootstrap_hash.c
+++ b/Python/bootstrap_hash.c
@@ -20,7 +20,7 @@
# endif
#endif
-#ifdef MEMORY_SANITIZER
+#ifdef _Py_MEMORY_SANITIZER
# include <sanitizer/msan_interface.h>
#endif
@@ -147,7 +147,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int blocking, int raise)
else {
n = syscall(SYS_getrandom, dest, n, flags);
}
-# ifdef MEMORY_SANITIZER
+# ifdef _Py_MEMORY_SANITIZER
if (n > 0) {
__msan_unpoison(dest, n);
}
diff --git a/Python/pymath.c b/Python/pymath.c
index c1606bd..24b8042 100644
--- a/Python/pymath.c
+++ b/Python/pymath.c
@@ -17,7 +17,7 @@ double _Py_force_double(double x)
/* inline assembly for getting and setting the 387 FPU control word on
gcc/x86 */
-#ifdef MEMORY_SANITIZER
+#ifdef _Py_MEMORY_SANITIZER
__attribute__((no_sanitize_memory))
#endif
unsigned short _Py_get_387controlword(void) {