Fixed compilability with Micrsoft visual C++
authorfojtik <>
Sat, 20 Oct 2012 10:17:29 +0200
changeset 760 71623bbf8093
parent 759 ed78c627f666
child 763 504ce1e3e94a
Fixed compilability with Micrsoft visual C++
drivers/can_multi_peeakwin32/can_multi_peak_win32.c
src/dcf.c
--- a/drivers/can_multi_peeakwin32/can_multi_peak_win32.c	Sat Oct 20 10:16:56 2012 +0200
+++ b/drivers/can_multi_peeakwin32/can_multi_peak_win32.c	Sat Oct 20 10:17:29 2012 +0200
@@ -20,6 +20,8 @@
 
 UNS8 LIBAPI canSend_driver(CAN_HANDLE fd0, Message const *m);
 
+#define Data data  /* temporary fix */
+
 
 #define VERSION_2
 
--- a/src/dcf.c	Sat Oct 20 10:16:56 2012 +0200
+++ b/src/dcf.c	Sat Oct 20 10:17:29 2012 +0200
@@ -51,6 +51,11 @@
 UNS8 init_consise_dcf(CO_Data* d,UNS8 nodeId);
 
 
+#ifdef _MSC_VER
+#define inline _inline
+#endif  /* _MSC_VER */
+
+
 inline void start_node(CO_Data* d, UNS8 nodeId){
     /* Ask slave node to go in operational mode */
     masterSendNMTstateChange (d, nodeId, NMT_Start_Node);