Merge pull request #2 from klickverbot/master

Temporary workaround for DMD bug 7127.

Author: WalterBright

deimos/openssl/_d_util.d

@@ -8,19 +8,10 @@ package:
 // Very boiled down version because we cannot use std.traits without causing
 // DMD to create a ModuleInfo reference for _d_util, which would require users
 // to include the Deimos files in the build.
-
-template ReturnType(T){
+template ExternC(T) if (is(typeof(*(T.init)) P == function)) {
 	static if (is(typeof(*(T.init)) R == return)) {
-		alias R ReturnType;
-	}
-}
-
-template ParameterTypeTuple(T) {
-	static if (is(typeof(*(T.init)) P == function)) {
-		alias P ParameterTypeTuple;
+		static if (is(typeof(*(T.init)) P == function)) {
+			alias extern(C) R function(P) ExternC;
+		}
 	}
 }
-
-template ExternC(T) {
-	alias extern(C) ReturnType!T function(ParameterTypeTuple!T) ExternC;
-}

deimos/openssl/ssl.d

@@ -693,7 +693,7 @@ enum SSL_SESSION_CACHE_MAX_SIZE_DEFAULT = (1024*20);
  * supposed to be fixed at 16 bytes so the id will be padded after the callback
  * returns in this case. It is also an error for the callback to set the size to
  * zero. */
-alias ExternC!(int function(const(SSL)* ssl, ubyte* id,
+alias ExternC!(int function(/+ FIXME: @@BUG7127@@ const+/ SSL* ssl, ubyte* id,
 uint* id_len)) GEN_SESSION_CB;
 
 struct ssl_comp_st {
@@ -1133,7 +1133,7 @@ version(OPENSSL_NO_COMP) {
 				 * 1 fail if verify fails */
 	ExternC!(int function(int ok,X509_STORE_CTX* ctx)) verify_callback; /* fail if callback returns 0 */
 
-	ExternC!(void function(const(SSL)* ssl,int type,int val)) info_callback; /* optional informational callback */
+	ExternC!(void function(/+ FIXME: @@BUG7127@@ const+/ SSL* ssl,int type,int val)) info_callback; /* optional informational callback */
 
 	int error;		/* error bytes to be written */
 	int error_code;		/* actual code */