[FFmpeg-devel] [PATCH] avdevice/sdl2: Suppress macro redefinition warning

* [FFmpeg-devel] [PATCH] avdevice/sdl2: Suppress macro redefinition warning
@ 2025-03-18  9:45 Andreas Rheinhardt
  2025-03-19 23:13 ` Andreas Rheinhardt
  0 siblings, 1 reply; 2+ messages in thread
From: Andreas Rheinhardt @ 2025-03-18  9:45 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

[-- Attachment #1: Type: text/plain, Size: 27 bytes --]

Patch attached.

- Andreas

[-- Attachment #2: 0001-avdevice-sdl2-Suppress-macro-redefinition-warning.patch --]
[-- Type: text/x-patch, Size: 1075 bytes --]

From 32dd03b2baa745a6c9b6e8cd80b3847b75e3a152 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Tue, 18 Mar 2025 10:40:00 +0100
Subject: [PATCH] avdevice/sdl2: Suppress macro redefinition warning

SDL2's headers #define HAVE_PTHREAD_SETNAME_NP (to one here);
we also have a config define which leads the compiler to
warn about this when the values are distinct (as they are here).
Suppress this warning by including config.h before SDL.h.
The latter will then redefine our define which doesn't matter
and which does not lead to warnings because compilers don't warn
about system headers by default (depending upon -Wsystem-headers).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavdevice/sdl2.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 491c8dafe8..35b0bf4d35 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -23,6 +23,8 @@
  * libSDL2 output device
  */
 
+#include "config.h"
+
 #include <SDL.h>
 #include <SDL_thread.h>
 
-- 
2.45.2


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread