Bug 972761 - Move WindowsVersion.h to MFBT. r=froydnj
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Fri, 28 Feb 2014 07:58:47 +0900
changeset 188298 da8693a783a8e44e9093070cb12cc8590e812100
parent 188297 8daa52f6b3f3f0850e297db7ccb412eb82f45099
child 188299 9257425b1ab09eb870ee2f698b612b7c1a42bdf3
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs972761
milestone30.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 972761 - Move WindowsVersion.h to MFBT. r=froydnj
mfbt/WindowsVersion.h
mfbt/moz.build
xpcom/base/WindowsVersion.h
xpcom/base/moz.build
rename from xpcom/base/WindowsVersion.h
rename to mfbt/WindowsVersion.h
--- a/xpcom/base/WindowsVersion.h
+++ b/mfbt/WindowsVersion.h
@@ -1,16 +1,17 @@
 /* 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 mozilla_WindowsVersion_h
 #define mozilla_WindowsVersion_h
 
-#include "nscore.h"
+#include "mozilla/Attributes.h"
+#include <stdint.h>
 #include <windows.h>
 
 namespace mozilla
 {
   inline bool
   IsWindowsVersionOrLater(uint32_t aVersion)
   {
     static uint32_t minVersion = 0;
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
@@ -56,16 +56,21 @@ EXPORTS.mozilla = [
     'ThreadLocal.h',
     'TypedEnum.h',
     'Types.h',
     'TypeTraits.h',
     'Vector.h',
     'WeakPtr.h',
 ]
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXPORTS.mozilla += [
+        'WindowsVersion.h',
+    ]
+
 UNIFIED_SOURCES = [
     'double-conversion/bignum-dtoa.cc',
     'double-conversion/bignum.cc',
     'double-conversion/cached-powers.cc',
     'double-conversion/diy-fp.cc',
     'double-conversion/double-conversion.cc',
     'double-conversion/fast-dtoa.cc',
     'double-conversion/fixed-dtoa.cc',
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -76,21 +76,16 @@ EXPORTS.mozilla += [
     'nsMemoryInfoDumper.h',
     'StackWalk.h',
     'StaticMutex.h',
     'StaticPtr.h',
     'SystemMemoryReporter.h',
     'VisualEventTracer.h',
 ]
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXPORTS.mozilla += [
-        'WindowsVersion.h',
-    ]
-
 # nsDebugImpl isn't unified because we disable PGO so that NS_ABORT_OOM isn't
 # optimized away oddly.
 SOURCES += [
     'nsDebugImpl.cpp',
 ]
 SOURCES['nsDebugImpl.cpp'].no_pgo = True
 
 UNIFIED_SOURCES += [