aboutsummaryrefslogtreecommitdiff
path: root/lib/lufa
diff options
context:
space:
mode:
authorsameehj <sameeh.j@gmail.com>2018-05-10 06:39:46 +0300
committerJack Humbert <jack.humb@gmail.com>2018-05-09 23:39:46 -0400
commit03516d546009af0ca4d46989214c8153c70b0712 (patch)
treeafa93c60220a80ed2e88fa5eb9e4382a04c9fcdd /lib/lufa
parent00596d55e34c003d55a530366bedfb2ea467bedc (diff)
downloadqmk_firmware-03516d546009af0ca4d46989214c8153c70b0712.tar.gz
qmk_firmware-03516d546009af0ca4d46989214c8153c70b0712.zip
gcc 8.10 compilation fix (#2914)
* Use memmove instead of memcpy gcc 8.1 gives the following error: lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c:93:5: error: 'memcpy' accessing 42 bytes at offsets 28 and 0 overlaps 14 bytes at offset 28 [-Werror=restrict] This patch resolve this by using memmove instead Signed-off-by: Sameeh <Sameeh Jubran> * Remove ATTR_CONST from a void returning function gcc 8.10 gives the following error when attempting to compile lib/lufa/LUFA/Drivers/USB/Core/Events.h:334:5: error: 'const' attribute on function returning 'void' [-Werror=attributes] Signed-off-by: Sameeh <Sameeh Jubran>
Diffstat (limited to 'lib/lufa')
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c2
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Core/Events.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c b/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c
index 62f10c4e2..9250cad33 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c
@@ -90,7 +90,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
90 if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1]) 90 if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1])
91 return HID_PARSE_HIDStackOverflow; 91 return HID_PARSE_HIDStackOverflow;
92 92
93 memcpy((CurrStateTable + 1), 93 memmove(CurrStateTable + 1,
94 CurrStateTable, 94 CurrStateTable,
95 sizeof(HID_ReportItem_t)); 95 sizeof(HID_ReportItem_t));
96 96
diff --git a/lib/lufa/LUFA/Drivers/USB/Core/Events.h b/lib/lufa/LUFA/Drivers/USB/Core/Events.h
index 57fd0d9af..91fb31b62 100644
--- a/lib/lufa/LUFA/Drivers/USB/Core/Events.h
+++ b/lib/lufa/LUFA/Drivers/USB/Core/Events.h
@@ -331,7 +331,7 @@
331 #if !defined(__DOXYGEN__) 331 #if !defined(__DOXYGEN__)
332 /* Function Prototypes: */ 332 /* Function Prototypes: */
333 #if defined(__INCLUDE_FROM_EVENTS_C) 333 #if defined(__INCLUDE_FROM_EVENTS_C)
334 void USB_Event_Stub(void) ATTR_CONST; 334 void USB_Event_Stub(void);
335 335
336 #if defined(USB_CAN_BE_BOTH) 336 #if defined(USB_CAN_BE_BOTH)
337 void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); 337 void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);