From d5dba89fc032ba13c9b220208af98b42a1cd527e Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 27 Oct 2016 07:30:19 +0530 Subject: [PATCH] gstgl: Porting fixes for MSVC with Meson GL/gl.h needs windows.h on MSVC WINAPI should not be used with MSVC. It also causes a build error. --- gst-libs/gst/gl/gstglapi.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index 93b60b792b..43e6d4a688 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -62,6 +62,9 @@ # include # endif # else +# if defined(_MSC_VER) +# include +# endif # include # if defined(__WIN32__) || defined(_WIN32) # include @@ -73,7 +76,7 @@ #pragma GCC diagnostic pop #endif -#ifdef WINAPI +#if defined(WINAPI) && !defined(_MSC_VER) #define GSTGLAPI WINAPI #else #define GSTGLAPI