From effe8109a76e89c13943eb23f25d899de7eb868d Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 29 Oct 2025 03:23:46 +0100 Subject: [PATCH] [frontend] fix Simpleini warnings SI_NO_CONVERSION macro being redefined when provided by cmdline (freebsd, linux, etc) (#2877) Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2877 Reviewed-by: crueter Reviewed-by: MaranBr Co-authored-by: lizzie Co-committed-by: lizzie --- src/frontend_common/config.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/frontend_common/config.h b/src/frontend_common/config.h index 8b0599cc33..ff816443ad 100644 --- a/src/frontend_common/config.h +++ b/src/frontend_common/config.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -7,7 +10,12 @@ #include #include "common/settings.h" -#define SI_NO_CONVERSION +// May be defined on command line by system provided packages (FreeBSD devel/simpleini) +// but if building from source, it will not be defined, so just do it conditionally. +// Should probably define on CMake anyways but eh +#ifndef SI_NO_CONVERSION +# define SI_NO_CONVERSION 1 +#endif #include #include