[patch] Upstream patch (untested)

qca-ossl+openssl-1.0.patch (text/plain), 637 bytes, created by Davide Pesavento on 2010-04-06 21:04:23 UTC

--- trunk/kdesupport/qca/plugins/qca-ossl/qca-ossl.cpp	2008/09/24 19:23:30	864425
+++ trunk/kdesupport/qca/plugins/qca-ossl/qca-ossl.cpp	2009/06/08 11:08:43	978853
@@ -42,6 +42,15 @@
 #define OSSL_097
 #endif
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+// OpenSSL 1.0.0 makes a few changes that aren't very C++ friendly...
+// Among other things, CHECKED_PTR_OF returns a void*, but is used in
+// contexts requiring STACK pointers.
+#undef CHECKED_PTR_OF
+#define CHECKED_PTR_OF(type, p) \
+	            ((_STACK*) (1 ? p : (type*)0))
+#endif
+
 using namespace QCA;
 
 namespace opensslQCAPlugin {