From: Bob Beck <beck@openssl.org>
Date: Tue, 28 Apr 2026 15:15:10 +0000 (-0600)
Subject: Fix accidental double guard in openssl/types.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c06af2ec8a49ea0895360e585c903ddae6b87b07;p=thirdparty%2Fopenssl.git

Fix accidental double guard in openssl/types.h

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)
---

diff --git a/include/openssl/types.h b/include/openssl/types.h
index cdb21495240..cfc021ef1a0 100644
--- a/include/openssl/types.h
+++ b/include/openssl/types.h
@@ -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) */