Commit c06af2ec8a for openssl.org

commit c06af2ec8a49ea0895360e585c903ddae6b87b07
Author: Bob Beck <beck@openssl.org>
Date:   Tue Apr 28 09:15:10 2026 -0600

    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 cdb2149524..cfc021ef1a 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) */