From 03516d546009af0ca4d46989214c8153c70b0712 Mon Sep 17 00:00:00 2001 From: sameehj Date: Thu, 10 May 2018 06:39:46 +0300 Subject: 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 * 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 --- lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c | 2 +- lib/lufa/LUFA/Drivers/USB/Core/Events.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/lufa') 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, if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1]) return HID_PARSE_HIDStackOverflow; - memcpy((CurrStateTable + 1), + memmove(CurrStateTable + 1, CurrStateTable, sizeof(HID_ReportItem_t)); 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 @@ #if !defined(__DOXYGEN__) /* Function Prototypes: */ #if defined(__INCLUDE_FROM_EVENTS_C) - void USB_Event_Stub(void) ATTR_CONST; + void USB_Event_Stub(void); #if defined(USB_CAN_BE_BOTH) void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub); -- cgit v1.2.3-24-g4f1b