Merge pull request #156 from meshtastic/main

PaulZC · web-flow · commit bded268243ed · 2025-05-01T16:04:29.000+01:00
Update ICM_20948_C.h - add ifndef PORTDUINO to fix compilation
diff --git a/src/util/ICM_20948_C.h b/src/util/ICM_20948_C.h
@@ -22,7 +22,10 @@ extern "C"
 {
 #endif /* __cplusplus */
 
+// Portduino target uses system memcmp call, which conflicts with this
+#ifndef PORTDUINO
 extern int memcmp(const void *, const void *, size_t); // Avoid compiler warnings
+#endif
 
 // Define if the DMP will be supported
 // Note: you must have 14290/14301 Bytes of program memory available to store the DMP firmware!

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,10 @@ extern "C"`
`22`	`22`	`{`
`23`	`23`	`#endif /* __cplusplus */`
`24`	`24`
	`25`	`+// Portduino target uses system memcmp call, which conflicts with this`
	`26`	`+#ifndef PORTDUINO`
`25`	`27`	`extern int memcmp(const void , const void , size_t); // Avoid compiler warnings`
	`28`	`+#endif`
`26`	`29`
`27`	`30`	`// Define if the DMP will be supported`
`28`	`31`	`// Note: you must have 14290/14301 Bytes of program memory available to store the DMP firmware!`