[PATCH 39/50] [avis-payload] Correct Calling Convention for Windows


Michael Schonberg <mschonberg@...>
 

From: Mike Schonberg <mschonberg@nyx.com>

The avis payload headers need the correct calling convention to export functions
from the dynamic libraries.

Signed-off-by: Mike Schonberg <mschonberg@nyx.com>
---
common/c_cpp/src/c/windows/wombat/wConfig.h | 5 +----
mama/c_cpp/src/c/payload/avismsg/avispayload.h | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/c_cpp/src/c/windows/wombat/wConfig.h b/common/c_cpp/src/c/windows/wombat/wConfig.h
index 2b944be..1c9f788 100644
--- a/common/c_cpp/src/c/windows/wombat/wConfig.h
+++ b/common/c_cpp/src/c/windows/wombat/wConfig.h
@@ -36,11 +36,8 @@
#elif defined( MAMA_DLL ) && defined( BRIDGE )
/* We are building mama bridge as a dll */
# define MAMAExpDLL __declspec( dllimport )
-# define MAMAExpBridgeDLL __declspec( dllimport )
# define COMMONExpDLL __declspec( dllimport )
-# define MAMACPPExpDLL
-# define MAMDAExpDLL
-# define MAMDAOPTExpDLL
+# define MAMAExpBridgeDLL __declspec( dllexport )
# define WMWExpDLL __declspec( dllimport )
#elif defined( MAMA_DLL ) && defined( MAMACPP )
/* We are building mamacpp as a dll */
diff --git a/mama/c_cpp/src/c/payload/avismsg/avispayload.h b/mama/c_cpp/src/c/payload/avismsg/avispayload.h
index 2e87888..69135e2 100755
--- a/mama/c_cpp/src/c/payload/avismsg/avispayload.h
+++ b/mama/c_cpp/src/c/payload/avismsg/avispayload.h
@@ -30,11 +30,11 @@ extern "C" {
#endif


-MAMAExpDLL
+MAMAExpBridgeDLL
extern mama_status
avismsgPayload_destroyImpl (mamaPayloadBridge mamaPayloadBridge);

-MAMAExpDLL
+MAMAExpBridgeDLL
extern mama_status
avismsgPayload_createImpl (mamaPayloadBridge* result, char* identifier);

--
1.7.7.6

Join Openmama-dev@lists.openmama.org to automatically receive all group messages.