diff options
| author | Lasse Laursen <lasse@lasselaursen.com> | 2015-01-17 10:06:40 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2015-01-17 10:58:46 +1100 |
| commit | c3ca2f04fe5131362f46ae3fdd12ebe5b3b55773 (patch) | |
| tree | 70cfcff47630f217efa4cc2eb2fbebaf9b29e121 | |
| parent | 5f7c5ea1f9d860bc8fabc3be85b9868323b0bfe0 (diff) | |
| download | gstreamer-plugins-bad-c3ca2f04fe5131362f46ae3fdd12ebe5b3b55773.tar.gz | |
glapi: fix compilation with latest MSVC
https://bugzilla.gnome.org/show_bug.cgi?id=743041
Conflicts:
gst-libs/gst/gl/gstglapi.h
| -rw-r--r-- | gst-libs/gst/gl/gstglapi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h index 83b94a252..a07a0feb0 100644 --- a/gst-libs/gst/gl/gstglapi.h +++ b/gst-libs/gst/gl/gstglapi.h @@ -79,7 +79,7 @@ # else # include <GL/gl.h> # include <GL/glu.h> -# if __WIN32__ || _WIN32 +# if defined(__WIN32__) || defined(_WIN32) # include <GL/glext.h> # endif # endif @@ -125,7 +125,7 @@ typedef enum #define GST_GL_EXT_BEGIN(name, gl_availability, min_gl, maj_gl, gles_maj, \ gles_min, ext_suf, ext_name) #define GST_GL_EXT_FUNCTION(ret, name, args) \ - ret GSTGLAPI (*name) args; + ret (GSTGLAPI *name) args; #define GST_GL_EXT_END() typedef struct _GstGLFuncs |