Bug 943994 - Build toolkit/components/mediasniffer in unified mode; r=padenot
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 28 Nov 2013 08:36:28 -0500
changeset 157978 ddc05aa598f362b388de827c040047ba89804a39
parent 157977 11b3857b72cb2d17e53d4c2d29af816d83fd24e7
child 157979 3479997ab20e648ca75162c5d1c2fda18c93a6b4
push id36888
push usereakhgari@mozilla.com
push dateThu, 28 Nov 2013 13:36:41 +0000
treeherdermozilla-inbound@ddc05aa598f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot
bugs943994
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 943994 - Build toolkit/components/mediasniffer in unified mode; r=padenot
toolkit/components/mediasniffer/moz.build
toolkit/components/mediasniffer/nsMediaSniffer.h
--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -5,18 +5,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
 EXPORTS += [
     'nsMediaSniffer.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
+    'mp3sniff.c',
     'nsMediaSniffer.cpp',
     'nsMediaSnifferModule.cpp',
 ]
 
-SOURCES += [
-    'mp3sniff.c',
-]
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/mediasniffer/nsMediaSniffer.h
+++ b/toolkit/components/mediasniffer/nsMediaSniffer.h
@@ -1,14 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 tw=80 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 nsMediaSniffer_h
+#define nsMediaSniffer_h
 
 #include "nsIModule.h"
 #include "nsIFactory.h"
 
 #include "nsIComponentManager.h"
 #include "nsIComponentRegistrar.h"
 #include "nsIContentSniffer.h"
 #include "mozilla/Attributes.h"
@@ -35,8 +37,10 @@ class nsMediaSniffer MOZ_FINAL : public 
     const uint8_t* mMask;
     const uint8_t* mPattern;
     const uint32_t mLength;
     const char* mContentType;
   };
 
   static nsMediaSnifferEntry sSnifferEntries[];
 };
+
+#endif