fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-07 19:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #117 from battlesnake/master

Browse Source 
Fixed failing build when socket.h adds flexible arrays to end of structures
This commit is contained in:
Pavel Kirienko
2017-11-24 21:36:56 +02:00
committed by GitHub
parent a1022b0f0c e797d69cb7
commit ba9af4ce93
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp
+7 -8
View File
@@ -219,18 +219,17 @@ class SocketCanIface : public uavcan::ICanIface
iov.iov_base = &sockcan_frame;
iov.iov_len = sizeof(sockcan_frame);
struct Control
{
cmsghdr cm;
std::uint8_t data[sizeof(::timeval)];
};
auto control = Control();
static constexpr size_t ControlSize = sizeof(cmsghdr) + sizeof(::timeval);
using ControlStorage = typename std::aligned_storage<ControlSize>::type;
ControlStorage control_storage;
auto control = reinterpret_cast<std::uint8_t *>(&control_storage);
std::fill(control, control + ControlSize, 0x00);
auto msg = ::msghdr();
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_control = &control;
msg.msg_controllen = sizeof(control);
msg.msg_control = control;
msg.msg_controllen = ControlSize;
const int res = ::recvmsg(fd_, &msg, MSG_DONTWAIT);
if (res <= 0)