GitHub/openssl
1
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2026-05-07 20:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix accidental double guard in openssl/types.h

Browse Source 
The windows goo before the guard tricked my tooling

(doing stuff like this on every include is a bit icky, we should
probably fix this somehow)

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Wed May  6 11:36:08 2026
(Merged from https://github.com/openssl/openssl/pull/31001)
This commit is contained in:
Bob Beck
2026-04-28 09:15:10 -06:00
committed by Norbert Pocs
parent 7029431ebe
commit c06af2ec8a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openssl/types.h
-4
View File
@@ -11,8 +11,6 @@
* Unfortunate workaround to avoid symbol conflict with wincrypt.h
* See https://github.com/openssl/openssl/issues/9981
*/
#if !defined(OSSL_OPENSSL_TYPES_H)
#define OSSL_OPENSSL_TYPES_H
#ifdef _WIN32
#define WINCRYPT_USE_SYMBOL_PREFIX
@@ -250,5 +248,3 @@ typedef struct ossl_echstore_st OSSL_ECHSTORE;
#endif
#endif /* OPENSSL_TYPES_H */
#endif /* !defined(OSSL_OPENSSL_TYPES_H) */