From 75cde08e8d6b47d08e91ff89d2ceada6fe33d1ef Mon Sep 17 00:00:00 2001 From: derrod Date: Wed, 21 Aug 2024 10:30:13 +0200 Subject: [PATCH] libobs: Rename OBS_NIX_PLATFORM_X11_GLX to OBS_NIX_PLATFORM_INVALID Deprecated in 28.0. Renamed so that the values of non-deprecated members stay the same. --- libobs/obs-nix-platform.c | 5 +---- libobs/obs-nix-platform.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libobs/obs-nix-platform.c b/libobs/obs-nix-platform.c index 0db6dd0d4..8762eee0c 100644 --- a/libobs/obs-nix-platform.c +++ b/libobs/obs-nix-platform.c @@ -25,10 +25,7 @@ static void *obs_nix_platform_display = NULL; void obs_set_nix_platform(enum obs_nix_platform_type platform) { - PRAGMA_WARN_PUSH - PRAGMA_WARN_DEPRECATION - assert(platform != OBS_NIX_PLATFORM_X11_GLX); - PRAGMA_WARN_POP + assert(platform != OBS_NIX_PLATFORM_INVALID); obs_nix_platform = platform; } diff --git a/libobs/obs-nix-platform.h b/libobs/obs-nix-platform.h index 502dbf2aa..a8583c02e 100644 --- a/libobs/obs-nix-platform.h +++ b/libobs/obs-nix-platform.h @@ -24,7 +24,7 @@ extern "C" { #endif enum obs_nix_platform_type { - OBS_NIX_PLATFORM_X11_GLX OBS_DEPRECATED, + OBS_NIX_PLATFORM_INVALID, OBS_NIX_PLATFORM_X11_EGL, OBS_NIX_PLATFORM_WAYLAND, };