mirror of
https://github.com/pentoo/pentoo-overlay
synced 2025-12-13 11:57:51 +01:00
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From d522a46fca981331fddac3117047030b5dcf5c83 Mon Sep 17 00:00:00 2001
|
||
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
|
||
Date: Mon, 31 Jul 2023 15:46:20 -0400
|
||
Subject: [PATCH] fix lto-type-mismatch in guidummy.cpp
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
link time optimization requires all functions named the same to actually
|
||
operate the same. I am pretty sure this fixes it without breaking
|
||
anything.
|
||
Fixes: https://github.com/RfidResearchGroup/proxmark3/issues/2058
|
||
|
||
src/proxgui.h:35:6: error: type of ‘ShowPictureWindow’ does not match original declaration [-Werror=lto-type-mismatch]
|
||
35 | void ShowPictureWindow(uint8_t *data, int len);
|
||
| ^
|
||
src/guidummy.cpp:33:17: note: type mismatch in parameter 2
|
||
33 | extern "C" void ShowPictureWindow(char *fn) {
|
||
| ^
|
||
src/guidummy.cpp:33:17: note: type ‘void’ should match type ‘int’
|
||
src/guidummy.cpp:33:17: note: ‘ShowPictureWindow’ was previously declared here
|
||
---
|
||
client/src/guidummy.cpp | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/client/src/guidummy.cpp b/client/src/guidummy.cpp
|
||
index e54c1d94e1..2882fd41de 100644
|
||
--- a/client/src/guidummy.cpp
|
||
+++ b/client/src/guidummy.cpp
|
||
@@ -30,7 +30,7 @@ extern "C" void ShowGraphWindow(void) {
|
||
extern "C" void HideGraphWindow(void) {}
|
||
extern "C" void RepaintGraphWindow(void) {}
|
||
|
||
-extern "C" void ShowPictureWindow(char *fn) {
|
||
+extern "C" void ShowPictureWindow(char *fn, int len) {
|
||
static int warned = 0;
|
||
|
||
if (!warned) {
|