diff data-provider.c @ 239:ec81395bf08d

Solve name collisions and other problems caused by including Windows headers
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Thu, 12 Feb 2015 19:13:55 +0100
parents 97112b45b838
children
line wrap: on
line diff
--- a/data-provider.c	Thu Jan 29 18:40:07 2015 +0100
+++ b/data-provider.c	Thu Feb 12 19:13:55 2015 +0100
@@ -11,14 +11,14 @@
 
 
 /* message callback */
-void CVICALLBACK MessageCB (void *msg)
+static void CVICALLBACK send_message_callback(void *msg)
 {
 	if (msg != NULL)
 		logmessage(INFO, msg);
 }
 
 
-void SendMessage(int threadId, const char *frmt, ...)
+void send_message(int thread, const char *frmt, ...)
 {
 	/* message buffer */
 	char *message = messages[messageid++ % DATA_PROVIDER_MSGNUM];
@@ -30,6 +30,6 @@
 	va_end(args);
 	
 	/* signal main thread */
-	PostDeferredCallToThread(MessageCB, message, threadId);
+	PostDeferredCallToThread(send_message_callback, message, thread);
 }