Bug 823921 - Fixed content/media/wmf compilation on mingw r=khuey

content/media/MediaDecoder.h

@@ -228,6 +228,12 @@ static inline bool IsCurrentThread(nsIThread* aThread) {
   return NS_GetCurrentThread() == aThread;
 }
 
+// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to
+// GetTickCount() and conflicts with MediaDecoder::GetCurrentTime implementation.
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
 class MediaDecoder : public nsIObserver,
                      public AbstractMediaDecoder
 {

content/media/wmf/WMF.h

@@ -29,8 +29,6 @@ which makes Windows Media Foundation unavailable.
 #include <propvarutil.h>
 #include <wmcodecdsp.h>
 
-#pragma comment(lib,"uuid.lib")
-#pragma comment(lib,"mfuuid.lib")
 
 namespace mozilla {
 namespace wmf {

toolkit/library/Makefile.in

@@ -460,6 +460,10 @@ OS_LIBS += \
   $(NULL)
 endif
 
+ifdef MOZ_WMF
+OS_LIBS += $(call EXPAND_LIBNAME,mfuuid)
+endif
+
 EXTRA_DEPS += \
   $(topsrcdir)/intl/unicharutil/util/objs.mk \
   $(topsrcdir)/rdf/util/src/objs.mk \