From: Rich Salz <rsalz@openssl.org>
Date: Thu, 24 Mar 2016 20:43:19 +0000 (-0400)
Subject: Revert part of applink/Borland commit
X-Git-Tag: OpenSSL_1_1_0-pre5~229
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c1215a3c160a8f1d22582a0673398c5fb09ee74;p=oweals%2Fopenssl.git

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>
---

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;