# HG changeset patch # User fojtik <> # Date 1350721049 -7200 # Node ID 71623bbf80937770031cc6efabc9678cd47315ab # Parent ed78c627f6667aadb64d2d03ddbaa0e91499cb90 Fixed compilability with Micrsoft visual C++ diff -r ed78c627f666 -r 71623bbf8093 drivers/can_multi_peeakwin32/can_multi_peak_win32.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 diff -r ed78c627f666 -r 71623bbf8093 src/dcf.c --- 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);