Bug 1137489 - Fix unified build failure in gmp-clearkey. r=edwin
authorChris Pearce <cpearce@mozilla.com>
Sat, 28 Feb 2015 16:15:18 +1300
changeset 231242 0c41d373af29fdadab2820fc441fb6d20a9fc96f
parent 231241 4c7c8d030d084ad58603445094fe313e0cf2f237
child 231243 3ca0b29f0eca6636df1f7a253f3cbaf75fe503ac
push id56217
push usercpearce@mozilla.com
push dateSat, 28 Feb 2015 03:16:10 +0000
treeherdermozilla-inbound@3ca0b29f0eca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersedwin
bugs1137489
milestone39.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 1137489 - Fix unified build failure in gmp-clearkey. r=edwin
media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
media/gmp-clearkey/0.1/WMFAACDecoder.cpp
media/gmp-clearkey/0.1/gmp-clearkey.cpp
--- a/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
@@ -1,21 +1,25 @@
 /* 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/. */
 
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "ClearKeyDecryptionManager.h"
 #include "ClearKeySessionManager.h"
 #include "ClearKeyUtils.h"
 #include "ClearKeyStorage.h"
 #include "ClearKeyPersistence.h"
 #include "gmp-task-utils.h"
+#if defined(ENABLE_WMF)
+#include "WMFUtils.h"
+#endif
 
 #include "mozilla/Assertions.h"
 
 using namespace mozilla;
 using namespace std;
 
 ClearKeySessionManager::ClearKeySessionManager()
   : mDecryptionManager(ClearKeyDecryptionManager::Get())
--- a/media/gmp-clearkey/0.1/WMFAACDecoder.cpp
+++ b/media/gmp-clearkey/0.1/WMFAACDecoder.cpp
@@ -10,16 +10,18 @@
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "WMFAACDecoder.h"
+#include <algorithm>
+#include <stdint.h>
 
 using std::vector;
 
 namespace wmf {
 
 WMFAACDecoder::WMFAACDecoder()
   : mDecoder(nullptr)
   , mChannels(0)
--- a/media/gmp-clearkey/0.1/gmp-clearkey.cpp
+++ b/media/gmp-clearkey/0.1/gmp-clearkey.cpp
@@ -2,24 +2,26 @@
  * 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/. */
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "ClearKeySessionManager.h"
-#if defined(ENABLE_WMF)
-#include "WMFUtils.h"
-#endif
-
 #include "gmp-api/gmp-decryption.h"
 #include "gmp-api/gmp-platform.h"
 #include "mozilla/Attributes.h"
 
+#if defined(ENABLE_WMF)
+#include "WMFUtils.h"
+#include "AudioDecoder.h"
+#include "VideoDecoder.h"
+#endif
+
 static GMPPlatformAPI* sPlatform = nullptr;
 GMPPlatformAPI*
 GetPlatform()
 {
   return sPlatform;
 }
 
 extern "C" {