Topics

[PATCH 24/30] Replaced numerous #ifdef WIN32 with port.h #ifdef


Michael Schonberg <mschonberg@...>
 

Most were callbacks where __stdcall needed to be replaced with
MAMACALLTYPE or "#include "wincompat.h"" which can be replaced with
"port.h".

Signed-off-by: Mike Schonberg <mschonberg@...>
---
mama/c_cpp/src/c/bridge/avis/bridge.c | 5 +-
mama/c_cpp/src/c/bridge/avis/msg.c | 5 +-
mama/c_cpp/src/c/bridge/avis/transportbridge.c | 5 +-
mama/c_cpp/src/c/conflation/connection.c | 4 +-
mama/c_cpp/src/c/conflation/connection_int.h | 10 +---
mama/c_cpp/src/c/conflation/manager.c | 5 +-
mama/c_cpp/src/c/conflation/manager_int.h | 4 +-
mama/c_cpp/src/c/conflation/serverconnection_int.h | 8 +--
mama/c_cpp/src/c/mama/conflation/manager.h | 2 +-
mama/c_cpp/src/c/mama/datetime.h | 4 +-
mama/c_cpp/src/c/mama/fielddesc.h | 4 +-
mama/c_cpp/src/c/mama/mama.h | 12 +---
mama/c_cpp/src/c/mama/msg.h | 14 +----
mama/c_cpp/src/c/mama/msgfield.h | 4 +-
mama/c_cpp/src/c/mama/timezone.h | 4 +-
mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c | 4 +-
mama/c_cpp/src/c/playback/playbackFileParser.h | 10 +---
mama/c_cpp/src/c/playback/playbackpublisher.h | 5 +-
mama/c_cpp/src/c/priceimpl.c | 19 +-----
mama/c_cpp/src/regression/c/tools/basicinbox.c | 31 ++--------
mama/c_cpp/src/regression/c/tools/basicpub.c | 50 +++-------------
mama/c_cpp/src/regression/c/tools/basicsub.c | 61 ++++----------------
22 files changed, 56 insertions(+), 214 deletions(-)

diff --git a/mama/c_cpp/src/c/bridge/avis/bridge.c b/mama/c_cpp/src/c/bridge/avis/bridge.c
index cfb920c..5f2b973 100755
--- a/mama/c_cpp/src/c/bridge/avis/bridge.c
+++ b/mama/c_cpp/src/c/bridge/avis/bridge.c
@@ -21,10 +21,7 @@

#include <avis/elvin.h>

-#ifdef WIN32
-#include <wombat/wincompat.h>
-#endif /* WIN32 */
-
+#include "port.h"

#include <mama/mama.h>
#include <timers.h>
diff --git a/mama/c_cpp/src/c/bridge/avis/msg.c b/mama/c_cpp/src/c/bridge/avis/msg.c
index 92c1da3..82176e9 100644
--- a/mama/c_cpp/src/c/bridge/avis/msg.c
+++ b/mama/c_cpp/src/c/bridge/avis/msg.c
@@ -19,15 +19,12 @@
* 02110-1301 USA
*/

+#include "port.h"
#include <stdlib.h>
#include <string.h>

#include <avis/elvin.h>

-#ifdef WIN32
-#include <wombat/wincompat.h>
-#endif /* WIN32 */
-
#include <mama/mama.h>
#include <msgimpl.h>
#include "avisdefs.h"
diff --git a/mama/c_cpp/src/c/bridge/avis/transportbridge.c b/mama/c_cpp/src/c/bridge/avis/transportbridge.c
index 7ab3b39..1d7bc44 100755
--- a/mama/c_cpp/src/c/bridge/avis/transportbridge.c
+++ b/mama/c_cpp/src/c/bridge/avis/transportbridge.c
@@ -22,10 +22,7 @@
#include <avis/elvin.h>
#include <avis/avis_client_config.h>

-#ifdef WIN32
-#include <wombat/wincompat.h>
-#endif /* WIN32 */
-
+#include "port.h"

#include <property.h>
#include <mama/mama.h>
diff --git a/mama/c_cpp/src/c/conflation/connection.c b/mama/c_cpp/src/c/conflation/connection.c
index 1689a3f..eddb291 100644
--- a/mama/c_cpp/src/c/conflation/connection.c
+++ b/mama/c_cpp/src/c/conflation/connection.c
@@ -19,9 +19,7 @@
* 02110-1301 USA
*/
#include <string.h>
-#ifdef WIN32
-#include <wombat/wincompat.h>
-#endif
+#include "port.h"

#include "mama/conflation/connection.h"
#include "conflation/connection_int.h"
diff --git a/mama/c_cpp/src/c/conflation/connection_int.h b/mama/c_cpp/src/c/conflation/connection_int.h
index c883123..a478b79 100644
--- a/mama/c_cpp/src/c/conflation/connection_int.h
+++ b/mama/c_cpp/src/c/conflation/connection_int.h
@@ -22,9 +22,8 @@
#ifndef MAMA_CONNECTION_INT_H__
#define MAMA_CONNECTION_INT_H__

-#ifndef WIN32
-#include <netinet/in.h>
-#endif
+#include "port.h"
+
#include "mama/conflation/connection.h"

#if defined(__cplusplus)
@@ -34,12 +33,7 @@ extern "C" {
#define MAX_STR_LEN 67
#define MAX_USER_STR_LEN 256

-/* This definition contains the length of the IP address string. */
-#ifndef WIN32
#define MAMACONNECTION_MAX_IP_ADDRESS_LEN INET_ADDRSTRLEN
-#else
-#define MAMACONNECTION_MAX_IP_ADDRESS_LEN 16
-#endif

typedef struct mamaConnection_
{
diff --git a/mama/c_cpp/src/c/conflation/manager.c b/mama/c_cpp/src/c/conflation/manager.c
index d596c29..90fed15 100644
--- a/mama/c_cpp/src/c/conflation/manager.c
+++ b/mama/c_cpp/src/c/conflation/manager.c
@@ -20,9 +20,7 @@
*/

#include <string.h>
-#ifdef WIN32
-#include <wombat/wincompat.h>
-#endif
+#include "port.h"

#include "mama/mama.h"
#include "mama/conflation/manager.h"
@@ -343,7 +341,6 @@ mamaConflationManager_publish (mamaConflationManager mgr,

}

-
static void MAMACALLTYPE
flushCallback (wombatQueue queue, void* data, void* itemClosure, void* closure)
{
diff --git a/mama/c_cpp/src/c/conflation/manager_int.h b/mama/c_cpp/src/c/conflation/manager_int.h
index a28721d..1464579 100644
--- a/mama/c_cpp/src/c/conflation/manager_int.h
+++ b/mama/c_cpp/src/c/conflation/manager_int.h
@@ -26,10 +26,8 @@

#ifndef MAMA_MANAGER_INT_H__
#define MAMA_MANAGER_INT_H__
+#include "port.h"

-#ifndef WIN32
-#include <netinet/in.h>
-#endif
#include "mama/conflation/manager.h"

#if defined(__cplusplus)
diff --git a/mama/c_cpp/src/c/conflation/serverconnection_int.h b/mama/c_cpp/src/c/conflation/serverconnection_int.h
index fd5186c..c5bcb51 100644
--- a/mama/c_cpp/src/c/conflation/serverconnection_int.h
+++ b/mama/c_cpp/src/c/conflation/serverconnection_int.h
@@ -22,9 +22,7 @@
#ifndef MAMA_SERVER_CONNECTION_INT_H__
#define MAMA_SERVER_CONNECTION_INT_H__

-#ifndef WIN32
-#include <netinet/in.h>
-#endif
+#include "port.h"

#if defined(__cplusplus)
extern "C" {
@@ -32,11 +30,7 @@ extern "C" {

typedef struct mamaServerConnection_
{
-#ifndef WIN32
char mIpAddress[INET_ADDRSTRLEN];
-#else
- char mIpAddress[16];
-#endif
uint16_t mPort;
int mConnectionStatus;
} mamaServerConnectionImpl;
diff --git a/mama/c_cpp/src/c/mama/conflation/manager.h b/mama/c_cpp/src/c/mama/conflation/manager.h
index f5dcf45..0bce01a 100644
--- a/mama/c_cpp/src/c/mama/conflation/manager.h
+++ b/mama/c_cpp/src/c/mama/conflation/manager.h
@@ -24,8 +24,8 @@
#define CONFLATION_MANAGER_H__

#include <string.h>
-#include "port.h"

+#include "port.h"
#include "mama/mama.h"

#if defined(__cplusplus)
diff --git a/mama/c_cpp/src/c/mama/datetime.h b/mama/c_cpp/src/c/mama/datetime.h
index bbbc724..ecc77d0 100644
--- a/mama/c_cpp/src/c/mama/datetime.h
+++ b/mama/c_cpp/src/c/mama/datetime.h
@@ -26,10 +26,8 @@
#include <mama/status.h>
#include <mama/types.h>
#include <mama/timezone.h>
+#include "port.h"

-#ifndef WIN32
-#include <sys/time.h>
-#endif
#include <time.h>


diff --git a/mama/c_cpp/src/c/mama/fielddesc.h b/mama/c_cpp/src/c/mama/fielddesc.h
index 0249748..8d7f907 100644
--- a/mama/c_cpp/src/c/mama/fielddesc.h
+++ b/mama/c_cpp/src/c/mama/fielddesc.h
@@ -30,9 +30,7 @@
#include <mama/types.h>
#include <stdlib.h>

-#ifndef WIN32
-#include <inttypes.h>
-#endif
+#include "port.h"

#if defined(__cplusplus)
extern "C" {
diff --git a/mama/c_cpp/src/c/mama/mama.h b/mama/c_cpp/src/c/mama/mama.h
index 557ac2c..0bffcbe 100644
--- a/mama/c_cpp/src/c/mama/mama.h
+++ b/mama/c_cpp/src/c/mama/mama.h
@@ -441,9 +441,7 @@ extern "C"
@param appName "site server" or application name of application that userId is using to connect (possibly NULL)
*/
typedef void (
- #ifdef WIN32
- __stdcall
- #endif
+ MAMACALLTYPE
*onSessionDisconnectCB) (const sessionDisconnectReason reason,
const char* userId,
const char* host,
@@ -453,9 +451,7 @@ extern "C"
Callback invoked after dynamic entitlements update has occurred
*/
typedef void (
- #ifdef WIN32
- __stdcall
- #endif
+ MAMACALLTYPE
*onEntitlementUpdateCB) (void);

/**
@@ -465,9 +461,7 @@ extern "C"
otherwise 0.
*/
typedef void (
- #ifdef WIN32
- __stdcall
- #endif
+ MAMACALLTYPE
*onEntitlementCheckingSwitchCB) (const int isEntitlementCheckingDisabled);
/**
Convenience structure for registering entitlement callbacks to MAMA
diff --git a/mama/c_cpp/src/c/mama/msg.h b/mama/c_cpp/src/c/mama/msg.h
index 2b99c85..2d17d22 100644
--- a/mama/c_cpp/src/c/mama/msg.h
+++ b/mama/c_cpp/src/c/mama/msg.h
@@ -26,12 +26,9 @@
#include <mama/status.h>
#include <mama/fielddesc.h>
#include <mama/msgtype.h>
+#include "port.h"
#include <stdlib.h>

-#ifndef WIN32
-#include <inttypes.h>
-#endif
-
#define ENTITLE_FIELD_NAME "wEntitleCode"
#define ENTITLE_FIELD_ID 496

@@ -2115,16 +2112,9 @@ mamaMsg_getFieldAsString (
* @param closure The closure specified in mamaMsg_iterateFields().
*
*/
-#ifndef WIN32
-typedef void(*mamaMsgIteratorCb)(const mamaMsg msg,
+typedef void(MAMACALLTYPE *mamaMsgIteratorCb)(const mamaMsg msg,
const mamaMsgField field,
void* closure);
-#else
-typedef void(__stdcall *mamaMsgIteratorCb)(
- const mamaMsg msg,
- const mamaMsgField field,
- void* closure);
-#endif

/**
* Invoke the specified callback for each field in the message.
diff --git a/mama/c_cpp/src/c/mama/msgfield.h b/mama/c_cpp/src/c/mama/msgfield.h
index b96b3fd..191b700 100644
--- a/mama/c_cpp/src/c/mama/msgfield.h
+++ b/mama/c_cpp/src/c/mama/msgfield.h
@@ -27,9 +27,7 @@
#include <mama/fielddesc.h>
#include <stdlib.h>

-#ifndef WIN32
-#include <inttypes.h>
-#endif
+#include "port.h"

#if defined(__cplusplus)
extern "C" {
diff --git a/mama/c_cpp/src/c/mama/timezone.h b/mama/c_cpp/src/c/mama/timezone.h
index bf31562..5991b8c 100644
--- a/mama/c_cpp/src/c/mama/timezone.h
+++ b/mama/c_cpp/src/c/mama/timezone.h
@@ -25,10 +25,8 @@
#include <mama/config.h>
#include <mama/status.h>
#include <mama/types.h>
+#include "port.h"

-#ifndef WIN32
-#include <sys/time.h>
-#endif
#include <time.h>


diff --git a/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c b/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c
index 70a69f0..7d13748 100755
--- a/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c
+++ b/mama/c_cpp/src/c/payload/avismsg/avismsgimpl.c
@@ -26,9 +26,7 @@

#include <avis/elvin.h>

-#ifdef WIN32
-#include <wombat/wincompat.h>
-#endif /* WIN32 */
+#include "port.h"

#include <mama/mama.h>
#include "avismsgimpl.h"
diff --git a/mama/c_cpp/src/c/playback/playbackFileParser.h b/mama/c_cpp/src/c/playback/playbackFileParser.h
index 70ac5e1..6435033 100644
--- a/mama/c_cpp/src/c/playback/playbackFileParser.h
+++ b/mama/c_cpp/src/c/playback/playbackFileParser.h
@@ -26,14 +26,8 @@
#if defined(__cplusplus)
extern "C" {
#endif
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/mman.h>
-#else
-#include <io.h>
-#include <windows.h>
-#include <winbase.h>
-#endif
+
+#include "port.h"

#include <stdlib.h>
#include <fcntl.h>
diff --git a/mama/c_cpp/src/c/playback/playbackpublisher.h b/mama/c_cpp/src/c/playback/playbackpublisher.h
index 13cb071..1e638d2 100644
--- a/mama/c_cpp/src/c/playback/playbackpublisher.h
+++ b/mama/c_cpp/src/c/playback/playbackpublisher.h
@@ -39,9 +39,8 @@ extern "C" {
#include <lookup2.h>
#include <wombat/wtable.h>
#include "playbackFileParser.h"
-#ifndef WIN32
-#include <unistd.h>
-#endif
+#include "port.h"
+
#define BUFFER_SIZE 128
typedef struct mamaFilePlayback_
{
diff --git a/mama/c_cpp/src/c/priceimpl.c b/mama/c_cpp/src/c/priceimpl.c
index f88249b..1d540a4 100644
--- a/mama/c_cpp/src/c/priceimpl.c
+++ b/mama/c_cpp/src/c/priceimpl.c
@@ -22,17 +22,6 @@
#include <mama/mama.h>
#include "priceimpl.h"

-/* The format specifier for large integers is different on window and gcc. The standard
- * specifier isn't supported on windows from compiler versions previous to VC7.
- */
-#ifdef WIN32
-#define MAMA_PRICE_IMPL_LARGE_INT32_FORMAT_SPECIFIER "%I32d"
-#define MAMA_PRICE_IMPL_LARGE_INT64_FORMAT_SPECIFIER "%I64d"
-#else
-#define MAMA_PRICE_IMPL_LARGE_INT32_FORMAT_SPECIFIER "%ld"
-#define MAMA_PRICE_IMPL_LARGE_INT64_FORMAT_SPECIFIER "%lld"
-#endif
-
static void mamaPriceImpl_getAsStringDecimal (double value,
mama_size_t decimals,
char* buf,
@@ -114,7 +103,7 @@ void mamaPriceImpl_getAsStringInteger (double value,
mama_size_t bufMaxLen)
{
int64_t integer = (int64_t)value;
- snprintf (buf, bufMaxLen, MAMA_PRICE_IMPL_LARGE_INT64_FORMAT_SPECIFIER, integer);
+ snprintf (buf, bufMaxLen, "%lld", integer);
}


@@ -128,18 +117,18 @@ void mamaPriceImpl_getAsStringFraction (double value,
int64_t numer = (int64_t)((double)denom * fraction);
if (numer == 0)
{
- snprintf (buf, bufMaxLen, MAMA_PRICE_IMPL_LARGE_INT64_FORMAT_SPECIFIER, integer);
+ snprintf (buf, bufMaxLen, "%lld", integer);
}
else if (integer == 0)
{
char formatSpecifier[20] = "";
- sprintf(formatSpecifier, "%s/%s", MAMA_PRICE_IMPL_LARGE_INT64_FORMAT_SPECIFIER, MAMA_PRICE_IMPL_LARGE_INT32_FORMAT_SPECIFIER);
+ sprintf(formatSpecifier, "%s/%s", "%lld", "%ld");
snprintf (buf, bufMaxLen, formatSpecifier, numer, denom);
}
else
{
char formatSpecifier[20] = "";
- sprintf(formatSpecifier, "%s %s/%s", MAMA_PRICE_IMPL_LARGE_INT64_FORMAT_SPECIFIER, MAMA_PRICE_IMPL_LARGE_INT64_FORMAT_SPECIFIER, MAMA_PRICE_IMPL_LARGE_INT32_FORMAT_SPECIFIER);
+ sprintf(formatSpecifier, "%s %s/%s", "%lld", "%lld", "%ld");
if (integer < 0)
{
numer = -numer;
diff --git a/mama/c_cpp/src/regression/c/tools/basicinbox.c b/mama/c_cpp/src/regression/c/tools/basicinbox.c
index 0f2f290..cba88ff 100755
--- a/mama/c_cpp/src/regression/c/tools/basicinbox.c
+++ b/mama/c_cpp/src/regression/c/tools/basicinbox.c
@@ -57,17 +57,11 @@ static void initializeMama (void);
static void createInbox (void);
static void createPublisher (void);
static void sendRequest (void);
-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+
+static void MAMACALLTYPE
msgCB (mamaMsg msg, void* closure);
-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+
+static void MAMACALLTYPE
errorCB (mama_status status, void* closure);


@@ -165,10 +159,7 @@ void initializeMama (void)
}

/* Used to destroy messages sent on the throttle */
-static void
-#ifdef WIN32
-__stdcall
-#endif
+static void MAMACALLTYPE
sendCompleteCb (mamaPublisher publisher,
mamaMsg msg,
mama_status status,
@@ -251,11 +242,7 @@ static void createInbox (void)
}
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
msgCB (mamaMsg msg, void *closure)
{
printf ("Received reply: %s\n", mamaMsg_toString (msg));
@@ -263,11 +250,7 @@ msgCB (mamaMsg msg, void *closure)
exit(0);
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
errorCB (mama_status status, void *closure)
{
printf ("Error creating inbox: %s\n",
diff --git a/mama/c_cpp/src/regression/c/tools/basicpub.c b/mama/c_cpp/src/regression/c/tools/basicpub.c
index 7568989..ab1c8e7 100644
--- a/mama/c_cpp/src/regression/c/tools/basicpub.c
+++ b/mama/c_cpp/src/regression/c/tools/basicpub.c
@@ -78,37 +78,23 @@ NULL
static void parseCommandLine (int argc, const char **argv);
static void initializeMama (void);
static void createIntervalTimer (void);
-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+
+static void MAMACALLTYPE
timerCallback (mamaTimer timer, void *closure);
+
static void createInboundSubscription (void);

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
inboundCreateCb (mamaSubscription subscription, void *closure);

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
inboundErrorCb (mamaSubscription subscription,
mama_status status,
void* platformError,
const char *subject,
void *closure);

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
inboundMsgCb (mamaSubscription subscription,
mamaMsg msg,
void *closure,
@@ -362,11 +348,7 @@ static void createInboundSubscription (void)
}
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
inboundCreateCb (mamaSubscription subscription, void *closure)
{
if (gQuietLevel < 2)
@@ -375,11 +357,7 @@ inboundCreateCb (mamaSubscription subscription, void *closure)
}
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
inboundErrorCb (mamaSubscription subscription,
mama_status status,
void* platformError,
@@ -391,11 +369,7 @@ inboundErrorCb (mamaSubscription subscription,
exit (status);
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
inboundMsgCb (mamaSubscription subscription,
mamaMsg msg,
void* closure,
@@ -437,11 +411,7 @@ static void createIntervalTimer (void)
}


-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
timerCallback (mamaTimer timer, void *closure)
{
publishMessage (NULL);
diff --git a/mama/c_cpp/src/regression/c/tools/basicsub.c b/mama/c_cpp/src/regression/c/tools/basicsub.c
index 17c1009..b096814 100755
--- a/mama/c_cpp/src/regression/c/tools/basicsub.c
+++ b/mama/c_cpp/src/regression/c/tools/basicsub.c
@@ -74,49 +74,30 @@ static void initializeMama (void);
static void createSubscriber (void);
static void createWildCardSubscriber (void);
static void displayMsg (mamaMsg msg);
-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+
+static void MAMACALLTYPE
displayCb (const mamaMsg msg,
const mamaMsgField field,
void * closure);

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
createCb (mamaSubscription subscription,
void * closure);

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
errorCb (mamaSubscription subscription,
mama_status status,
void* platformError,
const char* subject,
void* closure);

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
msgCb (mamaSubscription subscription,
mamaMsg msg,
void * closure,
void * itemClosure);

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
wildCardMsgCb (mamaSubscription subscription,
mamaMsg msg,
const char* topic,
@@ -252,11 +233,7 @@ static void createSubscriber (void)
}
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
createCb (mamaSubscription subscription, void *closure)
{
if (gQuietLevel < 2)
@@ -265,11 +242,7 @@ createCb (mamaSubscription subscription, void *closure)
}
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
errorCb (mamaSubscription subscription,
mama_status status,
void* platformError,
@@ -281,11 +254,7 @@ errorCb (mamaSubscription subscription,
exit (status);
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
msgCb (mamaSubscription subscription,
mamaMsg msg,
void* closure,
@@ -298,11 +267,7 @@ msgCb (mamaSubscription subscription,
displayMsg (msg);
}

-#ifdef WIN32
-static void __stdcall
-#else
-static void
-#endif
+static void MAMACALLTYPE
wildCardMsgCb (mamaSubscription subscription,
mamaMsg msg,
const char* topic,
@@ -335,11 +300,7 @@ wildCardMsgCb (mamaSubscription subscription,
displayMsg (msg);
}

-#ifdef WIN32
-void __stdcall
-#else
-void
-#endif
+void MAMACALLTYPE
displayCb (const mamaMsg msg,
const mamaMsgField field,
void* closure)
--
1.7.7.6