From c6c8c66f9933a0fe9d5bd566b0b48be4d19a8595 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Sun, 8 Dec 2024 19:43:23 +0800 Subject: [PATCH] 8345757: [ASAN] clang17 report dprintf macro redefined --- src/java.smartcardio/share/native/libj2pcsc/pcsc.c | 1 + src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/java.smartcardio/share/native/libj2pcsc/pcsc.c b/src/java.smartcardio/share/native/libj2pcsc/pcsc.c index 733c28a159ae9..26f91c6cf6b5f 100644 --- 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 index 4cdb7ba37ee04..c35bf677f2d09 100644 --- 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)