diff options
| author | lizzie <lizzie@eden-emu.dev> | 2025-10-29 03:23:46 +0100 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-10-29 03:23:46 +0100 |
| commit | effe8109a76e89c13943eb23f25d899de7eb868d (patch) | |
| tree | c6aba3666c07e19d83f9fdaa98a033f599a2638f /src | |
| parent | 29242977903b5b0645e5e152e937a83536ed5828 (diff) | |
[frontend] fix Simpleini warnings SI_NO_CONVERSION macro being redefined when provided by cmdline (freebsd, linux, etc) (#2877)
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2877
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontend_common/config.h | 10 |
1 files changed, 9 insertions, 1 deletions
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 <string> #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 <SimpleIni.h> #include <boost/algorithm/string/replace.hpp> |