You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/05/01 15:10:37 UTC
cvs commit: httpd-2.0/modules/ssl ssl_toolkit_compat.h
trawick 2003/05/01 06:10:36
Modified: modules/ssl ssl_toolkit_compat.h
Log:
tweak the const-ness of MODSSL_INFO_CB_ARG_TYPE based on the OpenSSL
version
this resolves some warnings with RH 8 (OpenSSL 0.9.6)
and some errors with AIX's native compiler (OpenSSL 0.9.6)
Revision Changes Path
1.32 +4 -0 httpd-2.0/modules/ssl/ssl_toolkit_compat.h
Index: ssl_toolkit_compat.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_toolkit_compat.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ssl_toolkit_compat.h 5 Apr 2003 22:45:28 -0000 1.31
+++ ssl_toolkit_compat.h 1 May 2003 13:10:36 -0000 1.32
@@ -107,7 +107,11 @@
#define MODSSL_BIO_CB_ARG_TYPE const char
#define MODSSL_CRYPTO_CB_ARG_TYPE const char
+#if (OPENSSL_VERSION_NUMBER < 0x00907000)
+#define MODSSL_INFO_CB_ARG_TYPE SSL*
+#else
#define MODSSL_INFO_CB_ARG_TYPE const SSL*
+#endif
#define MODSSL_CLIENT_CERT_CB_ARG_TYPE X509
#define MODSSL_PCHAR_CAST