Bug 524737 - trunk doesn't compile with --disable-ogg + --disable-wave
authorBartZilla <bartml@wp.pl>
Fri, 25 Jun 2010 16:48:12 -0400
changeset 34382 2a4412197a18246b3fbc53d23a9ba6b1bfbb16fe
parent 34381 8686a1a62d3ee3488ba99d5e865a28c9fc00f357
child 34383 43bf210715d20143fd552c8aa170ea5fc872e0e5
push id1430
push usereakhgari@mozilla.com
push dateFri, 25 Jun 2010 20:52:55 +0000
bugs524737
milestone1.9.2.6pre
Bug 524737 - trunk doesn't compile with --disable-ogg + --disable-wave
content/base/src/nsDocument.cpp
content/base/src/nsNodeUtils.cpp
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -169,17 +169,19 @@ static NS_DEFINE_CID(kDOMEventGroupCID, 
 #include "nsIContentViewer.h"
 #include "nsIXMLContentSink.h"
 #include "nsContentErrors.h"
 #include "nsIXULDocument.h"
 #include "nsIPrompt.h"
 #include "nsIPropertyBag2.h"
 #include "nsIDOMPageTransitionEvent.h"
 #include "nsFrameLoader.h"
+#ifdef MOZ_MEDIA
 #include "nsHTMLMediaElement.h"
+#endif // MOZ_MEDIA
 
 #include "mozAutoDocUpdate.h"
 
 #ifdef MOZ_SMIL
 #include "nsSMILAnimationController.h"
 #include "imgIContainer.h"
 #include "nsSVGUtils.h"
 #endif // MOZ_SMIL
--- a/content/base/src/nsNodeUtils.cpp
+++ b/content/base/src/nsNodeUtils.cpp
@@ -50,17 +50,19 @@
 #include "nsIDOMAttr.h"
 #include "nsCOMArray.h"
 #include "nsPIDOMWindow.h"
 #ifdef MOZ_XUL
 #include "nsXULElement.h"
 #endif
 #include "nsBindingManager.h"
 #include "nsGenericHTMLElement.h"
+#ifdef MOZ_MEDIA
 #include "nsHTMLMediaElement.h"
+#endif // MOZ_MEDIA
 
 // This macro expects the ownerDocument of content_ to be in scope as
 // |nsIDocument* doc|
 #define IMPL_MUTATION_NOTIFICATION(func_, content_, params_)      \
   PR_BEGIN_MACRO                                                  \
   nsINode* node = content_;                                       \
   NS_ASSERTION(node->GetOwnerDoc() == doc, "Bogus document");     \
   if (doc) {                                                      \