Hi,
The following change (r15883) breaks Trunk builds. Compiler error on
line 2086 (openssl.pas). Expected Pointer but got ShortInt.
------------------------------------------
$ git show HEAD
commit fc8a3f5eee1eda9bf82e7e720789c4fab3835785
Author: Felipe Monteiro de Carvalho <[email protected]>
Date: Mon Aug 23 14:32:31 2010 +0000
Small fix for PPEVP_PKEY
git-svn-id: http://svn.freepascal.org:/svn/fpc/tr...@15883 3ad0048d-3df7-031
diff --git a/packages/openssl/src/openssl.pas b/packages/openssl/src/openssl.pas
index 6172cf8..9bff87a 100644
--- a/packages/openssl/src/openssl.pas
+++ b/packages/openssl/src/openssl.pas
@@ -109,7 +109,7 @@ type
PBIO_METHOD = SslPtr;
PBIO = SslPtr;
PEVP_PKEY = SslPtr;
- PPEVP_PKEY = PEVP_PKEY;
+ PPEVP_PKEY = ^PEVP_PKEY;
PRSA = SslPtr;
PPRSA = ^PRSA;
PASN1_UTCTIME = SslPtr;
----------------------------------------------------
Attached is a patch to fix the build. I don't know the OpenSSL code
so don't know if a simple cast is ok, or if nil should have been
return. I went with the cast.
--
Regards,
- Graeme -
_______________________________________________
fpGUI - a cross-platform Free Pascal GUI toolkit
http://opensoft.homeip.net/fpgui/
diff --git a/packages/openssl/src/openssl.pas b/packages/openssl/src/openssl.pas
index 9bff87a..946604d 100644
--- a/packages/openssl/src/openssl.pas
+++ b/packages/openssl/src/openssl.pas
@@ -2083,7 +2083,7 @@ begin
if InitSSLInterface and Assigned(_PEM_read_bio_PrivateKey) then
Result := _PEM_read_bio_PrivateKey(bp, x, cb, u)
else
- Result := -1;
+ Result := Pointer(-1);
end;
{$IFNDEF WINDOWS}
_______________________________________________
fpc-devel maillist - [email protected]
http://lists.freepascal.org/mailman/listinfo/fpc-devel
