summary refs log tree commit diff
path: root/lib
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
parent00596d55e34c003d55a530366bedfb2ea467bedc (diff)
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')
-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 62f10c4e22..9250cad33a 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 57fd0d9af7..91fb31b620 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);