From e13e0937a29558a939abeea3ee5b9a6d8b69e2eb Mon Sep 17 00:00:00 2001 From: tytan652 Date: Mon, 23 Jan 2023 08:34:41 +0100 Subject: [PATCH] obs-scripting: Fix compilation warnings on Clang and GCC * Fix unused-parameter when Python is disabled * Calm PySys_SetArgv deprecation since Python 3.11 --- deps/obs-scripting/obs-scripting-python.c | 3 +++ deps/obs-scripting/obs-scripting.c | 1 + 2 files changed, 4 insertions(+) diff --git a/deps/obs-scripting/obs-scripting-python.c b/deps/obs-scripting/obs-scripting-python.c index 280cd4cc8..0f3073707 100644 --- a/deps/obs-scripting/obs-scripting-python.c +++ b/deps/obs-scripting/obs-scripting-python.c @@ -1702,7 +1702,10 @@ bool obs_scripting_load_python(const char *python_path) wchar_t *argv[] = {L"", NULL}; int argc = sizeof(argv) / sizeof(wchar_t *) - 1; + PRAGMA_WARN_PUSH + PRAGMA_WARN_DEPRECATION PySys_SetArgv(argc, argv); + PRAGMA_WARN_POP #ifdef DEBUG_PYTHON_STARTUP /* ---------------------------------------------- */ diff --git a/deps/obs-scripting/obs-scripting.c b/deps/obs-scripting/obs-scripting.c index 2c1d353ec..7e84f6e03 100644 --- a/deps/obs-scripting/obs-scripting.c +++ b/deps/obs-scripting/obs-scripting.c @@ -461,6 +461,7 @@ bool obs_scripting_python_runtime_linked(void) void obs_scripting_python_version(char *version, size_t version_length) { + UNUSED_PARAMETER(version_length); version[0] = 0; } #endif