Message ID | d666bdc0-3242-456d-823e-80da8ae29e6c@amyspark.me |
---|---|
State | Accepted |
Commit | ddc1cd5cdd2570bf3d6ab807ee0ecfacdf09431d |
Headers | show |
Series | configure: Set WIN32_LEAN_AND_MEAN at configure time | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
On Mon, 14 Aug 2023, L. E. Segovia wrote: > Including winsock2.h or windows.h without WIN32_LEAN_AND_MEAN cause > bzlib.h to parse as nonsense, due to an instance of #define char small > in rpcndr.h. > > See: > > https://stackoverflow.com/a/27794577 > > Reviewed-by: Martin Storsjö <martin@martin.st> > Signed-off-by: L. E. Segovia <amy@amyspark.me> > --- Thanks, pushed! // Martin
ddc1cd5cdd breaks the checks for ole32 and thus prevents detection of DXVA2. @ https://github.com/FFmpeg/FFmpeg/commit/ddc1cd5cdd2570bf3d6ab807ee0ecfacdf09431d Regards, Gyan
On Sat, 19 Aug 2023, Gyan Doshi wrote: > > ddc1cd5cdd breaks the checks for ole32 and thus prevents detection of DXVA2. > > @ > https://github.com/FFmpeg/FFmpeg/commit/ddc1cd5cdd2570bf3d6ab807ee0ecfacdf09431d Thanks for noticing this, and sorry for the breakage. It seems like this is fixable by adjusting the check for ole32 to include the right header explicitly - I'll send a patch. // Martin
diff --git a/compat/atomics/win32/stdatomic.h b/compat/atomics/win32/stdatomic.h index 28a627bfd3..4f8ac2bb60 100644 --- a/compat/atomics/win32/stdatomic.h +++ b/compat/atomics/win32/stdatomic.h @@ -19,7 +19,6 @@ #ifndef COMPAT_ATOMICS_WIN32_STDATOMIC_H #define COMPAT_ATOMICS_WIN32_STDATOMIC_H -#define WIN32_LEAN_AND_MEAN #include <stddef.h> #include <stdint.h> #include <windows.h> diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index dae8d9420d..2ff9735227 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -35,7 +35,6 @@ * As most functions here are used without checking return values, * only implement return values as necessary. */ -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <process.h> #include <time.h> diff --git a/configure b/configure index 932998b8d6..ff6a5c3600 100755 --- a/configure +++ b/configure @@ -5666,6 +5666,7 @@ case $target_os in fi ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -Wl,--large-address-aware + add_cppflags -DWIN32_LEAN_AND_MEAN shlibdir_default="$bindir_default" SLIBPREF="" SLIBSUF=".dll" @@ -5716,6 +5717,7 @@ case $target_os in fi ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -LARGEADDRESSAWARE + add_cppflags -DWIN32_LEAN_AND_MEAN shlibdir_default="$bindir_default" SLIBPREF="" SLIBSUF=".dll" @@ -5745,6 +5747,7 @@ case $target_os in enabled x86_64 && objformat="win64" || objformat="win32" enable dos_paths ! enabled small && test_cmd $windres --version && enable gnu_windres + add_cppflags -DWIN32_LEAN_AND_MEAN add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 ;; *-dos|freedos|opendos) diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index b548cd7afc..81e684b9be 100644 --- a/libavdevice/dshow_capture.h +++ b/libavdevice/dshow_capture.h @@ -27,7 +27,6 @@ #include "avdevice.h" #define COBJMACROS -#define WIN32_LEAN_AND_MEAN #include <windows.h> #define NO_DSHOW_STRSAFE #include <dshow.h> diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index f9dc846bf1..1b0cf5aa8f 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -30,7 +30,6 @@ #include "config.h" #if HAVE_WINDOWS_H -#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif #if HAVE_OPENGL_GL3_H diff --git a/libavfilter/vsrc_ddagrab.c b/libavfilter/vsrc_ddagrab.c index b65261f685..c3107e11b4 100644 --- a/libavfilter/vsrc_ddagrab.c +++ b/libavfilter/vsrc_ddagrab.c @@ -22,7 +22,6 @@ #undef _WIN32_WINNT #define _WIN32_WINNT 0x0A00 #endif -#define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 15cea7fa5b..2de6a7c3d9 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -34,11 +34,9 @@ #if HAVE_SYS_TIME_H #include <sys/time.h> #endif /* HAVE_SYS_TIME_H */ -#if HAVE_WINSOCK2_H -#include <winsock2.h> -#elif HAVE_SYS_SELECT_H +#if HAVE_SYS_SELECT_H #include <sys/select.h> -#endif /* HAVE_WINSOCK2_H */ +#endif /* HAVE_SYS_SELECT_H */ #endif /* !HAVE_POLL_H */ #include "network.h" diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index fbc0a55146..4f87e6f88b 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -21,7 +21,6 @@ #ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include "mem.h" diff --git a/libswscale/utils.c b/libswscale/utils.c index 8fe34a3437..8e74c6603e 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -34,7 +34,6 @@ #endif #endif #if HAVE_VIRTUALALLOC -#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif