Back out cset 1566a2e95c3b (bug 950505) for build failure on Windows when warnings are treated as errors

content/media/wmf/WMFUtils.h

@@ -4,9 +4,6 @@
  * 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"
@@ -102,5 +99,3 @@ IsFlagSet(DWORD flags, DWORD pattern) {
 }
 
 } // namespace mozilla
-
-#endif

content/media/wmf/moz.build

@@ -12,7 +12,7 @@ EXPORTS += [
     'WMFUtils.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'DXVA2Manager.cpp',
     'WMFByteStream.cpp',
     'WMFDecoder.cpp',