Selaa lähdekoodia

libobs: Replace OBS_UNUSED with UNUSED_PARAMETER

OBS_UNUSED is not portable to MSVC.
tytan652 3 vuotta sitten
vanhempi
sitoutus
12657e4fcc
2 muutettua tiedostoa jossa 9 lisäystä ja 4 poistoa
  1. 7 3
      libobs/obs-scene.c
  2. 2 1
      libobs/util/bmem.c

+ 7 - 3
libobs/obs-scene.c

@@ -1499,10 +1499,14 @@ static bool scene_audio_render(void *data, uint64_t *ts_out,
 	return true;
 }
 
-enum gs_color_space scene_video_get_color_space(
-	void *data OBS_UNUSED, size_t count OBS_UNUSED,
-	const enum gs_color_space *preferred_spaces OBS_UNUSED)
+enum gs_color_space
+scene_video_get_color_space(void *data, size_t count,
+			    const enum gs_color_space *preferred_spaces)
 {
+	UNUSED_PARAMETER(data);
+	UNUSED_PARAMETER(count);
+	UNUSED_PARAMETER(preferred_spaces);
+
 	enum gs_color_space space = GS_CS_SRGB;
 	struct obs_video_info ovi;
 	if (obs_get_video_info(&ovi)) {

+ 2 - 1
libobs/util/bmem.c

@@ -162,6 +162,7 @@ void *bmemdup(const void *ptr, size_t size)
 	return out;
 }
 
-OBS_DEPRECATED void base_set_allocator(struct base_allocator *defs OBS_UNUSED)
+OBS_DEPRECATED void base_set_allocator(struct base_allocator *defs)
 {
+	UNUSED_PARAMETER(defs);
 }