projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: faf7370)
d3dvideosink: fix redefinition of DECLARE_INTERFACE_IID
authorAndoni Morales Alastruey <ylatuya@gmail.com>
Tue, 20 Nov 2012 11:05:17 +0000 (12:05 +0100)
committerTim-Philipp Müller <tim@centricular.net>
Tue, 20 Nov 2012 11:10:25 +0000 (11:10 +0000)
https://bugzilla.gnome.org/show_bug.cgi?id=688510

sys/d3dvideosink/d3dvideosink.h patch | blob | history

diff --git a/sys/d3dvideosink/d3dvideosink.h b/sys/d3dvideosink/d3dvideosink.h
index a863448..d03084a 100644 (file)
--- a/sys/d3dvideosink/d3dvideosink.h
+++ b/sys/d3dvideosink/d3dvideosink.h
@@ -35,7 +35,7 @@
 #   else
 #    define DECLARE_INTERFACE_IID_(i,b,d) _COM_interface i : public b
 #   endif
-#  else
+#  elif !defined(DECLARE_INTERFACE_IID_)
 #   define DECLARE_INTERFACE_IID_(i,b,d) DECLARE_INTERFACE(i)
 #  endif
 # endif
Domain: Multimedia / Media Common;