diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-03-24 21:43:19 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-24 22:06:48 +0100 |
| commit | 9c1215a3c160a8f1d22582a0673398c5fb09ee74 (patch) | |
| tree | 0df1b2eee320132ad82da2009860e940a8238e20 /ms | |
| parent | More Borland removal. (diff) | |
| download | openssl-9c1215a3c160a8f1d22582a0673398c5fb09ee74.tar.xz openssl-9c1215a3c160a8f1d22582a0673398c5fb09ee74.zip | |
Revert part of applink/Borland commit
This allows developer to glue DLL built with VC into their application
compiled with Borland C.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'ms')
| -rw-r--r-- | ms/applink.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ms/applink.c b/ms/applink.c index c844b01887..832872324d 100644 --- a/ms/applink.c +++ b/ms/applink.c @@ -75,7 +75,16 @@ extern "C" { __declspec(dllexport) void ** - __cdecl +# if defined(__BORLANDC__) +/* + * __stdcall appears to be the only way to get the name + * decoration right with Borland C. Otherwise it works + * purely incidentally, as we pass no parameters. + */ +__stdcall +# else +__cdecl +# endif OPENSSL_Applink(void) { static int once = 1; |