diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2014-11-27 11:00:36 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 14:40:18 +0300 |
| commit | 0167fa00604443aa20a2fb627081a46f1c0be4ff (patch) | |
| tree | 5221bb560aaa19c26441c9d03a73b16541100d40 /libavdevice | |
| parent | 22e557917d08ed93e9c657f13c9669482341eb02 (diff) | |
msvc: Fix compilation errors due to header include order.
Ensures that the header include order is such that winsock2.h is always
included before windows.h or that windows.h does not include winsock.h.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/dshow_capture.h | 1 | ||||
| -rw-r--r-- | libavdevice/opengl_enc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index e4b4dce3fa..0252070284 100644 --- a/libavdevice/dshow_capture.h +++ b/libavdevice/dshow_capture.h @@ -27,6 +27,7 @@ #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 5f5b800569..434ae97a42 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -31,6 +31,7 @@ #include "config.h" #if HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif #if HAVE_OPENGL_GL3_H |