From 5b9ffb20880295e13050c4267023f45deb004c9e Mon Sep 17 00:00:00 2001
From: Ryan Smith <xpsycho@DAL.net>
Date: Sat, 23 May 2020 21:19:33 -0400
Subject: [PATCH] 152: Clean up libcrypto-compat declarations.

---
 configure.in               | 2 +-
 include/libcrypto-compat.h | 1 +
 include/struct.h           | 1 -
 src/Makefile.in            | 2 +-
 src/ircd.c                 | 1 -
 src/libcrypto-compat.c     | 3 +--
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 173dded3..a2ae2cd7 100644
--- a/configure.in
+++ b/configure.in
@@ -470,7 +470,7 @@ if test "X$cf_enable_openssl" != "Xno" ; then
     cf_enable_openssl="yes"
     encryption="enabled"
     AC_DEFINE(HAVE_ENCRYPTION_ON)
-    ENCRYPT_SRC="rc4.c dh.c"
+    ENCRYPT_SRC="rc4.c dh.c libcrypto-compat.c"
     AC_SUBST(ENCRYPT_SRC)
   else
     AC_MSG_RESULT(not found.  Please check your path.)
diff --git a/include/libcrypto-compat.h b/include/libcrypto-compat.h
index 5a5e4439..4f0e0d4c 100644
--- a/include/libcrypto-compat.h
+++ b/include/libcrypto-compat.h
@@ -1,6 +1,7 @@
 #ifndef LIBCRYPTO_COMPAT_H
 #define LIBCRYPTO_COMPAT_H
 
+#include <struct.h>
 #ifdef USE_SSL
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
diff --git a/include/struct.h b/include/struct.h
index 7bf74d9c..179d87b1 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -56,7 +56,6 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "libcrypto-compat.h"
 #endif
 
 #define REPORT_DO_DNS_	   ":%s NOTICE AUTH :*** Looking up your hostname..."
diff --git a/src/Makefile.in b/src/Makefile.in
index cddc467f..16fbb2cf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -18,7 +18,7 @@ RES_SRC =
 
 SOURCES = blalloc.c bsd.c channel.c clientlist.c clones.c confparse.c \
           fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c \
-          klines.c libcrypto-compat.c list.c m_nick.c m_rwho.c m_server.c m_services.c \
+          klines.c list.c m_nick.c m_rwho.c m_server.c m_services.c \
           m_stats.c m_who.c match.c memcount.c modules.c packet.c parse.c pcre.c \
           probability.c res.c s_auth.c s_bsd.c s_conf.c s_debug.c s_err.c \
           s_misc.c s_numeric.c s_serv.c s_user.c sbuf.c scache.c send.c \
diff --git a/src/ircd.c b/src/ircd.c
index e524f0cf..e1a7c9c1 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -47,7 +47,6 @@
 #include "hooks.h"
 #include "fds.h"
 #include "memcount.h"
-#include "libcrypto-compat.h"
 #include "spamfilter.h"
 
 aMotd      *motd;
diff --git a/src/libcrypto-compat.c b/src/libcrypto-compat.c
index c72818ae..b8c32850 100644
--- a/src/libcrypto-compat.c
+++ b/src/libcrypto-compat.c
@@ -7,9 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifdef USE_SSL
-
 #include "struct.h"
+#ifdef USE_SSL
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L