dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-06-24 08:47:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'libarchive-wincrypt-boringssl'

Browse Source 
5752bb41e3 libarchive: Avoid preprocessor symbol conflicts with boringssl on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12019
This commit is contained in:
Brad King
2026-05-08 11:38:33 +00:00
committed by Kitware Robot
parent ae54ef45cf 5752bb41e3
commit 40afd95f7c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/cmlibarchive/libarchive/archive_digest_private.h
View File

@@ -177,6 +177,13 @@ typedef struct {
#else
#include <windows.h>
#include <wincrypt.h>
/* Undefine indirect <wincrypt.h> symbols conflicting with BoringSSL/AWS-LC. */
#undef X509_NAME
#undef X509_EXTENSIONS
#undef PKCS7_ISSUER_AND_SERIAL
#undef PKCS7_SIGNER_INFO
#undef OCSP_REQUEST
#undef OCSP_RESPONSE
#define ARCHIVE_CRYPTO_WINCRYPT 1
typedef struct {
int valid;