]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix accidental double guard in openssl/types.h
authorBob Beck <beck@openssl.org>
Tue, 28 Apr 2026 15:15:10 +0000 (09:15 -0600)
committerNorbert Pocs <norbertp@openssl.org>
Wed, 6 May 2026 11:35:41 +0000 (13:35 +0200)
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)

include/openssl/types.h

index cdb21495240fb1f55efc203521590b2036cff382..cfc021ef1a052df31f0b18f9e75804c0e7fd4033 100644 (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) */