RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-17 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity

configure: Set WIN32_LEAN_AND_MEAN at configure time

Browse Source 
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

Signed-off-by: L. E. Segovia <amy@amyspark.me>
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
L. E. Segovia 2023-08-14 08:53:37 -03:00 committed by Martin Storsjö
parent c704901324
commit ddc1cd5cdd
9 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compat/atomics/win32/stdatomic.h
View File

@ -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>

1
compat/w32pthreads.h
View File

@ -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>

3
configure vendored
View File

@ -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)

1
libavdevice/dshow_capture.h
View File

@ -27,7 +27,6 @@
#include "avdevice.h"
#define COBJMACROS
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define NO_DSHOW_STRSAFE
#include <dshow.h>

1
libavdevice/opengl_enc.c
View File

@ -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

1
libavfilter/vsrc_ddagrab.c
View File

@ -22,7 +22,6 @@
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0A00
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

6
libavformat/os_support.c
View File

@ -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"

1
libavutil/wchar_filename.h
View File

@ -21,7 +21,6 @@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include "mem.h"

1
libswscale/utils.c
View File

@ -34,7 +34,6 @@
#endif
#endif
#if HAVE_VIRTUALALLOC
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif