From: Viktor Szakats <commit@vsz.me>
Date: Fri, 22 Aug 2025 19:43:44 +0000 (+0200)
Subject: openssl: merge two `#if` blocks
X-Git-Tag: curl-8_16_0~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=806d97d172040131185554da61b5796024d43051;p=thirdparty%2Fcurl.git

openssl: merge two `#if` blocks

Cherry-picked from #18330
Closes #18370
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 062678e64e..a3e3c29cf5 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -216,8 +216,10 @@ static void ossl_provider_cleanup(struct Curl_easy *data);
 
 #ifdef HAVE_BORINGSSL_LIKE
 typedef size_t numcert_t;
+typedef uint32_t sslerr_t;
 #else
 typedef int numcert_t;
+typedef unsigned long sslerr_t;
 #endif
 #define ossl_valsize_t numcert_t
 
@@ -244,12 +246,6 @@ typedef int numcert_t;
 #define HAVE_RANDOM_INIT_BY_DEFAULT 1
 #endif
 
-#ifdef HAVE_BORINGSSL_LIKE
-typedef uint32_t sslerr_t;
-#else
-typedef unsigned long sslerr_t;
-#endif
-
 /*
  * Whether the OpenSSL version has the API needed to support sharing an
  * X509_STORE between connections. The API is: