From 0167fa00604443aa20a2fb627081a46f1c0be4ff Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Thu, 27 Nov 2014 19:00:36 +1100 Subject: 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 --- libavdevice/dshow_capture.h | 1 + libavdevice/opengl_enc.c | 1 + 2 files changed, 2 insertions(+) (limited to 'libavdevice') diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index e4b4dce..0252070 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 #define NO_DSHOW_STRSAFE #include diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 5f5b800..434ae97 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 #endif #if HAVE_OPENGL_GL3_H -- cgit v1.1