From: Rainer Jung <rjung@apache.org>
Date: Wed, 10 Aug 2016 20:58:22 +0000 (+0000)
Subject: OpenSSL 1.1.0 compat:
X-Git-Tag: 2.5.0-alpha~1302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd14694a6590ab688ab5904f0f0d4ba86e2f8487;p=apache

OpenSSL 1.1.0 compat:
- move IDCONST macro outside of addition #if check.
  Otherwise we break compatibility with old
  OpenSSL 0.9.8 releases.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1755856 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 6795aceee6..459b6b34c2 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -135,6 +135,13 @@
 #define HAVE_SSL_CONF_CMD
 #endif
 
+/* session id constness */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define IDCONST
+#else
+#define IDCONST const
+#endif
+
 /**
   * The following features all depend on TLS extension support.
   * Within this block, check again for features (not version numbers).
@@ -166,13 +173,6 @@
 #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */
 #endif /* if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb) */
 
-/* session id constness */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-#define IDCONST
-#else
-#define IDCONST const
-#endif
-
 /* TLS session tickets */
 #if defined(SSL_CTX_set_tlsext_ticket_key_cb)
 #define HAVE_TLS_SESSION_TICKETS