From 6dbe9bea2e45791fc924645fb8b7813fdd7f4cd1 Mon Sep 17 00:00:00 2001
From: Ed Tanous <ed@tanous.net>
Date: Sun, 14 Apr 2024 10:24:20 -0700
Subject: Remove OpenSSL warnings ignore

If we include OpenSSL in extern "C" blocks consistently, c++ warnings no
longer appear.  This means we can remove the special case from meson.

Tested: Code compiles when built locally on an ubuntu 22.04 system.

Change-Id: I5add4113b32cd88b7fdd874174c845425a7c287a
Signed-off-by: Ed Tanous <ed@tanous.net>
---
 include/ossl_random.hpp     | 3 +++
 include/ssl_key_handler.hpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/ossl_random.hpp b/include/ossl_random.hpp
index b392410986..0e28944d83 100644
--- a/include/ossl_random.hpp
+++ b/include/ossl_random.hpp
@@ -2,7 +2,10 @@
 
 #include "logging.hpp"
 
+extern "C"
+{
 #include <openssl/rand.h>
+}
 
 #include <iostream>
 #include <limits>
diff --git a/include/ssl_key_handler.hpp b/include/ssl_key_handler.hpp
index d12fcabdc2..d7255dd87d 100644
--- a/include/ssl_key_handler.hpp
+++ b/include/ssl_key_handler.hpp
@@ -8,7 +8,6 @@
 extern "C"
 {
 #include <nghttp2/nghttp2.h>
-}
 #include <openssl/bio.h>
 #include <openssl/dh.h>
 #include <openssl/dsa.h>
@@ -18,6 +17,7 @@ extern "C"
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/ssl.h>
+}
 
 #include <boost/asio/ssl/context.hpp>
 
-- 
cgit v1.2.3