# HG changeset patch
# User greg
# Date 1248099080 -7200
# Node ID 0bb82be646302b3daf4dcbd22779c2093f2b618f
# Parent  b4bc22764a391cb683ed1ae9fb53c173240b257d
add extern \"C\" to keep compatibilty with C++

diff -r b4bc22764a39 -r 0bb82be64630 drivers/timers_win32/timers_win32.c
--- a/drivers/timers_win32/timers_win32.c	Mon Jul 20 10:57:11 2009 +0200
+++ b/drivers/timers_win32/timers_win32.c	Mon Jul 20 16:11:20 2009 +0200
@@ -25,11 +25,13 @@
 #include <stdlib.h>
 #include <sys/timeb.h>
 
+extern "C"
+{
 #include "applicfg.h"
 #include "can_driver.h"
 #include "timer.h"
 #include "timers_driver.h"
-
+};
 
 struct _timeb timebuffer;
 
diff -r b4bc22764a39 -r 0bb82be64630 drivers/win32/win32.c
--- a/drivers/win32/win32.c	Mon Jul 20 10:57:11 2009 +0200
+++ b/drivers/win32/win32.c	Mon Jul 20 16:11:20 2009 +0200
@@ -26,11 +26,12 @@
 */
 
 #include <windows.h>
-
+extern "C"
+{
 #include "canfestival.h"
 #include "timer.h"
 #include "timers_driver.h"
-
+};
 // GetProcAddress doesn't have an UNICODE version for NT
 #ifdef UNDER_CE
   #define myTEXT(str) TEXT(str)
@@ -92,8 +93,8 @@
 	{
 		handle = LoadLibrary(driver_name);
 	}
-	
-	if (!handle) 
+
+	if (!handle)
 	{
 		fprintf (stderr, "%s\n", GetLastError());
     	return NULL;
@@ -104,7 +105,7 @@
 	m_canOpen = (CANOPEN_DRIVER_PROC)GetProcAddress(handle, myTEXT("canOpen_driver"));
 	m_canClose = (CANCLOSE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canClose_driver"));
 	m_canChangeBaudRate = (CANCHANGEBAUDRATE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canChangeBaudRate_driver"));
-	
+
 	return handle;
 }
 
@@ -143,14 +144,14 @@
 		break;
 	}
 
-	#ifndef NOT_USE_DYNAMIC_LOADING	
+	#ifndef NOT_USE_DYNAMIC_LOADING
 	if (m_canOpen == NULL)
 	{
 	   	fprintf(stderr,"CanOpen : Can Driver dll not loaded\n");
 	   	return NULL;
 	}
 	#endif
-	
+
 	CAN_HANDLE fd0 = m_canOpen(board);
 	if(fd0)
 	{
@@ -158,7 +159,7 @@
 		canports[i].fd = fd0;
 		canports[i].d = d;
 		d->canHandle = (CAN_PORT)&canports[i];
-		CreateReceiveTask(&(canports[i]), &canports[i].receiveTask, &canReceiveLoop);
+		CreateReceiveTask(&(canports[i]), &canports[i].receiveTask, (void *)canReceiveLoop);
 		return (CAN_PORT)&canports[i];
 	}
 	else
@@ -172,17 +173,16 @@
 int canClose(CO_Data * d)
 {
 	UNS8 res;
-	
+
 	((CANPort*)d->canHandle)->used = 0;
 	CANPort* tmp = (CANPort*)d->canHandle;
 	d->canHandle = NULL;
-	
+
 	// close CAN port
 	res = m_canClose(tmp->fd);
 
 	// kill receiver task
 	WaitReceiveTaskEnd(&tmp->receiveTask);
-	
 	return res;
 }
 
@@ -194,7 +194,7 @@
 		res = m_canChangeBaudRate(((CANPort*)port)->fd, baud);
 		//EnterMutex();
 		return res; // OK
-	}               
+	}
 	return 1; // NOT OK
 }