|
@@ -1,36 +0,0 @@
|
|
|
-From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001
|
|
|
-From: Andre Hartmann <aha_1980@gmx.de>
|
|
|
-Date: Mon, 8 Jul 2019 21:35:12 +0200
|
|
|
-Subject: =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98SIOCGST?=
|
|
|
- =?UTF-8?q?AMP=E2=80=99=20was=20not=20declared"?=
|
|
|
-MIME-Version: 1.0
|
|
|
-Content-Type: text/plain; charset=UTF-8
|
|
|
-Content-Transfer-Encoding: 8bit
|
|
|
-
|
|
|
-Fixes: QTBUG-76957
|
|
|
-Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
|
|
|
-Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
-Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
-
|
|
|
-[Retrieved from:
|
|
|
-https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482]
|
|
|
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
----
|
|
|
- src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 +
|
|
|
- 1 file changed, 1 insertion(+)
|
|
|
-
|
|
|
-diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
|
|
|
-index 74b0d1d..a2da146 100644
|
|
|
---- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
|
|
|
-+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
|
|
|
-@@ -45,6 +45,7 @@
|
|
|
-
|
|
|
- #include <linux/can/error.h>
|
|
|
- #include <linux/can/raw.h>
|
|
|
-+#include <linux/sockios.h>
|
|
|
- #include <errno.h>
|
|
|
- #include <unistd.h>
|
|
|
- #include <net/if.h>
|
|
|
---
|
|
|
-cgit v1.2.1
|
|
|
-
|