[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  9c1215a3c160a8f1d22582a0673398c5fb09ee74 (commit)
      from  c3ddb263315c7196b488f384b3bc82cd474c8698 (commit)


- Log -----------------------------------------------------------------
commit 9c1215a3c160a8f1d22582a0673398c5fb09ee74
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Mar 24 16:43:19 2016 -0400

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ms/applink.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ms/applink.c b/ms/applink.c
index c844b01..8328723 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;