# HG changeset patch # User Christian Taedcke # Date 1266305816 -3600 # Node ID 93ad82ee0426b155ff4e6834f8f065ccb274cba9 # Parent 11b21e9a92f6b7465323114ea3b5234fbd0e95ed FIXED: - added CALLBACK to can callback function prototypes diff -r 11b21e9a92f6 -r 93ad82ee0426 drivers/can_ixxat_win32/ixxat.cpp --- a/drivers/can_ixxat_win32/ixxat.cpp Sat Dec 11 14:24:09 2010 +0100 +++ b/drivers/can_ixxat_win32/ixxat.cpp Tue Feb 16 08:36:56 2010 +0100 @@ -295,19 +295,19 @@ //------------------------------------------------------------------------ extern "C" - UNS8 canReceive_driver(CAN_HANDLE inst, Message *m) + UNS8 __stdcall canReceive_driver(CAN_HANDLE inst, Message *m) { return (UNS8)reinterpret_cast(inst)->receive(m); } extern "C" - UNS8 canSend_driver(CAN_HANDLE inst, Message const *m) + UNS8 __stdcall canSend_driver(CAN_HANDLE inst, Message const *m) { return (UNS8)reinterpret_cast(inst)->send(m); } extern "C" - CAN_HANDLE canOpen_driver(s_BOARD *board) + CAN_HANDLE __stdcall canOpen_driver(s_BOARD *board) { try { @@ -320,14 +320,14 @@ } extern "C" - int canClose_driver(CAN_HANDLE inst) + int __stdcall canClose_driver(CAN_HANDLE inst) { delete reinterpret_cast(inst); return 1; } extern "C" - UNS8 canChangeBaudRate_driver( CAN_HANDLE fd, char* baud) + UNS8 __stdcall canChangeBaudRate_driver( CAN_HANDLE fd, char* baud) { //printf("canChangeBaudRate not yet supported by this driver\n"); return 0;