Mercurial > hg > fxanalyse
diff data-provider.h @ 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 | 6ccc428c412a |
children |
line wrap: on
line diff
--- a/data-provider.h Thu Jan 29 18:40:07 2015 +0100 +++ b/data-provider.h Thu Feb 12 19:13:55 2015 +0100 @@ -9,9 +9,6 @@ /* data queue */ extern CmtTSQHandle dataQueue; -/* callback receiving messages in the main thread */ -void CVICALLBACK MessageCB (void *callbackData); - /* number of data channels */ #define NCHAN 8 @@ -22,7 +19,7 @@ }; /* send messages to the main thread */ -void SendMessage(int threadId, const char *frmt, ...); +void send_message(int threadid, const char *frmt, ...); /* data providers */ int CVICALLBACK FakeDataProvider (void *functionData);