Bug 950505 - Build content/media/wmf in unified mode; r=roc
☠☠ backed out by e353c1d40586 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 15 Dec 2013 19:00:54 -0500
changeset 160549 1566a2e95c3bb8a630626b322e1ad6652aa79863
parent 160548 f8fea5ea69a1d504af7f3903e18a949f765e1eba
child 160550 caa78bef50e3e8fdcb4a8e8128fa4584f088000c
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs950505
milestone29.0a1
Bug 950505 - Build content/media/wmf in unified mode; r=roc
content/media/wmf/WMFUtils.h
content/media/wmf/moz.build
--- a/content/media/wmf/WMFUtils.h
+++ b/content/media/wmf/WMFUtils.h
@@ -1,14 +1,17 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef WMFUtils_h
+#define WMFUtils_h
+
 #include "WMF.h"
 #include "nsString.h"
 #include "nsRect.h"
 #include "VideoUtils.h"
 
 // Various utilities shared by WMF backend files.
 
 namespace mozilla {
@@ -94,8 +97,10 @@ int64_t
 GetSampleTime(IMFSample* aSample);
 
 inline bool
 IsFlagSet(DWORD flags, DWORD pattern) {
   return (flags & pattern) == pattern;
 }
 
 } // namespace mozilla
+
+#endif
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -7,17 +7,17 @@
 EXPORTS += [
     'DXVA2Manager.h',
     'WMF.h',
     'WMFDecoder.h',
     'WMFReader.h',
     'WMFUtils.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'DXVA2Manager.cpp',
     'WMFByteStream.cpp',
     'WMFDecoder.cpp',
     'WMFReader.cpp',
     'WMFSourceReaderCallback.cpp',
     'WMFUtils.cpp',
 ]