From 62fe4ca21f9874afdd0c76d28ef15107384e17d2 Mon Sep 17 00:00:00 2001 From: "SKY-20230424HUG\\Administrator" Date: Thu, 25 Apr 2024 10:16:22 +0800 Subject: [PATCH 1/2] add undef to fix windows compile error --- src/common/xqc_random.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/xqc_random.h b/src/common/xqc_random.h index 665dc4fc..9bcb6c1c 100644 --- a/src/common/xqc_random.h +++ b/src/common/xqc_random.h @@ -13,6 +13,10 @@ #include "src/common/xqc_common.h" #ifdef XQC_SYS_WINDOWS #include +#undef PKCS7_SIGNER_INFO +#undef X509_CERT_PAIR +#undef X509_EXTENSIONS +#undef X509_NAME #endif From 13000611c982a18c5d1ea875470f7ea1322b2d2e Mon Sep 17 00:00:00 2001 From: "SKY-20230424HUG\\Administrator" Date: Thu, 25 Apr 2024 12:42:22 +0800 Subject: [PATCH 2/2] fix link error for demo_server and demo_client --- demo/demo_client.c | 1 + demo/demo_server.c | 1 + 2 files changed, 2 insertions(+) diff --git a/demo/demo_client.c b/demo/demo_client.c index c256d9e0..7765e120 100644 --- a/demo/demo_client.c +++ b/demo/demo_client.c @@ -25,6 +25,7 @@ #pragma comment(lib,"ws2_32.lib") #pragma comment(lib,"event.lib") #pragma comment(lib, "Iphlpapi.lib") +#pragma comment(lib, "Bcrypt.lib") #include "../tests/getopt.h" #else #include diff --git a/demo/demo_server.c b/demo/demo_server.c index b41d6657..caec2382 100644 --- a/demo/demo_server.c +++ b/demo/demo_server.c @@ -25,6 +25,7 @@ #pragma comment(lib,"ws2_32.lib") #pragma comment(lib,"event.lib") #pragma comment(lib, "Iphlpapi.lib") +#pragma comment(lib, "Bcrypt.lib") #endif