From 0d1a584f56911013641a74a5489e4ec7af37b619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 7 May 2018 14:04:26 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@611 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/io/pican.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src_main/io/pican.cpp b/src_main/io/pican.cpp index 4b94b992..a124d279 100644 --- a/src_main/io/pican.cpp +++ b/src_main/io/pican.cpp @@ -74,8 +74,9 @@ bool PICAN::closeDevice() { int PICAN::readDevice(void * read_to, int max_size) { #ifdef PIP_CAN + can_frame frame; int ret = 0; - ret = read(sock, &frame, sizeof(can_frame)); + ret = ::read(sock, &frame, sizeof(can_frame)); if(ret < 0) {piCoutObj << "Error while read CAN frame " << ret; return -1;} piCoutObj << "receive CAN frame Id =" << frame.can_id; memcpy(read_to, frame.data, piMini(frame.can_dlc, max_size)); @@ -93,7 +94,7 @@ int PICAN::writeDevice(const void * data, int max_size) { frame.can_dlc = max_size; memcpy(frame.data, data, max_size); int ret = 0; - ret = write(sock, &frame, sizeof(can_frame)); + ret = ::write(sock, &frame, sizeof(can_frame)); if(ret < 0) {piCoutObj << "Error while send CAN frame " << ret; return -1;} return max_size; #endif