8345757: [ASAN] clang17 report dprintf macro redefined

sendaoYan · Dec 8, 2024 · c6c8c66 · c6c8c66
1 parent c517ffb
commit c6c8c66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/java.smartcardio/share/native/libj2pcsc/pcsc.c b/src/java.smartcardio/share/native/libj2pcsc/pcsc.c
@@ -45,6 +45,7 @@
 #define dprintf2(s, p1, p2) printf(s, p1, p2)
 #define dprintf3(s, p1, p2, p3) printf(s, p1, p2, p3)
 #else
+#undef dprintf
 #define dprintf(s)
 #define dprintf1(s, p1)
 #define dprintf2(s, p1, p2)

diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h
@@ -42,6 +42,7 @@ void *p11FindFunction(JNIEnv *env, jlong jHandle, const char *functionName);
 #define dprintf2(s, p1, p2) printf(s, p1, p2)
 #define dprintf3(s, p1, p2, p3) printf(s, p1, p2, p3)
 #else
+#undef dprintf
 #define dprintf(s)
 #define dprintf1(s, p1)
 #define dprintf2(s, p1, p2)