From: Mike Schonberg <mschonberg@nyx.com>

Renamed shutdown() to xxxShutdown() to avoid namespace conflicts with Windows
system libraries.

Signed-off-by: Mike Schonberg <mschonberg@nyx.com>
---
.../src/testtools/performance/c/mamaconsumerc_v2.c | 6 +++---
.../src/testtools/performance/c/mamapingpongc.c | 6 +++---
.../src/testtools/performance/c/mamaproducerc_v2.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mama/c_cpp/src/testtools/performance/c/mamaconsumerc_v2.c b/mama/c_cpp/src/testtools/performance/c/mamaconsumerc_v2.c
index 13b52c6..2dd8153 100644
--- a/mama/c_cpp/src/testtools/performance/c/mamaconsumerc_v2.c
+++ b/mama/c_cpp/src/testtools/performance/c/mamaconsumerc_v2.c
@@ -457,7 +457,7 @@ static void signalCatcher
int sig
);

-static void shutdown(void);
+static void consumerShutdown (void);

static void printHeader
(
@@ -1126,7 +1126,7 @@ int main (int argc, const char** argv)
displayStatsGroupBuckets(&gStatsGroup);
}

- shutdown();
+ consumerShutdown();

for(i=0; i<NUM_STATS_GROUPS; ++i)
destroyStatsGroup(&(gStatsGroups[i]));
@@ -1195,7 +1195,7 @@ static void printHeader
}


-static void shutdown(void)
+static void consumerShutdown (void)
{
int i;
unsigned nsecSleep = gThrottle != -1 ? 1000000000 / gThrottle : 0;
diff --git a/mama/c_cpp/src/testtools/performance/c/mamapingpongc.c b/mama/c_cpp/src/testtools/performance/c/mamapingpongc.c
index 8069892..775db81 100644
--- a/mama/c_cpp/src/testtools/performance/c/mamapingpongc.c
+++ b/mama/c_cpp/src/testtools/performance/c/mamapingpongc.c
@@ -243,7 +243,7 @@ static void signalCatcher
int sig
);

-static void shutdown(pingPongCtx* ppCtx, pingPongEventCtx* eventCtx);
+static void pingpongShutdown (pingPongCtx* ppCtx, pingPongEventCtx* eventCtx);

static void
initMessages(message* pMsgs,
@@ -375,7 +375,7 @@ int main (int argc, const char** argv)
/* start the mama bridge, blocks here */
mama_start (gPingPongCtx.mBridge);

- shutdown(&gPingPongCtx, &eventCtx);
+ pingpongShutdown (&gPingPongCtx, &eventCtx);
mama_close ();

if(!eventCtx.mServer)
@@ -491,7 +491,7 @@ static void publishMessage
seqNum++;
}

-static void shutdown(pingPongCtx* ppCtx, pingPongEventCtx* eventCtx)
+static void pingpongShutdown (pingPongCtx* ppCtx, pingPongEventCtx* eventCtx)
{
pthread_mutexattr_t attr;

diff --git a/mama/c_cpp/src/testtools/performance/c/mamaproducerc_v2.c b/mama/c_cpp/src/testtools/performance/c/mamaproducerc_v2.c
index b8884df..bb64e53 100644
--- a/mama/c_cpp/src/testtools/performance/c/mamaproducerc_v2.c
+++ b/mama/c_cpp/src/testtools/performance/c/mamaproducerc_v2.c
@@ -309,7 +309,7 @@ static void displayCallback
void* closure
);

-static void shutdown
+static void producerShutdown
(
uint32_t msgVar
);
@@ -943,7 +943,7 @@ int main (int argc, const char **argv)
}
pthread_mutex_unlock (&pendingShutdownLock);

- shutdown(msgVar);
+ producerShutdown (msgVar);

MAMA_CHECK (mamaDateTime_destroy (gLastDisplayTime));
MAMA_CHECK (mamaDateTime_destroy (gNowTime));
@@ -953,7 +953,7 @@ int main (int argc, const char **argv)
return 0;
}

-static void shutdown
+static void producerShutdown
(
uint32_t msgVar
)
--
1.7.7.6