From ee791f9d2aa7bc727607a5692ed42179f3b95906 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Tue, 19 Dec 2023 20:12:20 +0100 Subject: [PATCH] Stop undefining X509_CERT_PAIR Pointed out in #910 --- patches/windows_headers.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index 6eafa499cd..2e257be1aa 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch @@ -14,7 +14,7 @@ #include --- include/openssl/ossl_typ.h.orig Wed Nov 1 13:15:36 2023 +++ include/openssl/ossl_typ.h Wed Nov 1 13:18:23 2023 -@@ -82,6 +82,22 @@ typedef struct asn1_object_st ASN1_OBJECT; +@@ -82,6 +82,21 @@ typedef struct asn1_object_st ASN1_OBJECT; typedef struct ASN1_ITEM_st ASN1_ITEM; typedef struct asn1_pctx_st ASN1_PCTX; @@ -27,7 +27,6 @@ +#endif +#endif +#undef X509_NAME -+#undef X509_CERT_PAIR +#undef X509_EXTENSIONS +#undef OCSP_REQUEST +#undef OCSP_RESPONSE @@ -60,7 +59,7 @@ Digest_ID MD5 --- include/openssl/x509.h.orig Wed Nov 1 13:15:36 2023 +++ include/openssl/x509.h Wed Nov 1 13:18:44 2023 -@@ -100,6 +100,19 @@ +@@ -100,6 +100,18 @@ extern "C" { #endif @@ -73,7 +72,6 @@ +#endif +#endif +#undef X509_NAME -+#undef X509_CERT_PAIR +#undef X509_EXTENSIONS +#endif +