Bug 888088 (part 1) - Fix #include ordering in js/src/builtin/. r=nnethercote.
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Tue, 23 Jul 2013 17:34:18 -0700
changeset 152028 ab30741c56548fd069e76abbbd39ea7090aecd52
parent 152027 4bf993171121da33f2cae1fec79f2c61d8ba1178
child 152029 695e5051cad27bd46e6ec4397b0b2318669aaa3b
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnnethercote
bugs888088
milestone25.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 888088 (part 1) - Fix #include ordering in js/src/builtin/. r=nnethercote.
js/src/builtin/Intl.cpp
js/src/builtin/Iterator-inl.h
js/src/builtin/ParallelArray.cpp
js/src/builtin/Profilers.cpp
--- a/js/src/builtin/Intl.cpp
+++ b/js/src/builtin/Intl.cpp
@@ -13,34 +13,33 @@
 
 #include <string.h>
 
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
 #include "jsobj.h"
 
-#include "vm/DateTime.h"
-#include "vm/GlobalObject.h"
-#include "vm/Interpreter.h"
-#include "vm/Stack.h"
-#include "vm/StringBuffer.h"
-
 #if ENABLE_INTL_API
 #include "unicode/locid.h"
 #include "unicode/numsys.h"
 #include "unicode/ucal.h"
 #include "unicode/ucol.h"
 #include "unicode/udat.h"
 #include "unicode/udatpg.h"
 #include "unicode/uenum.h"
 #include "unicode/unum.h"
 #include "unicode/ustring.h"
 #endif
 #include "unicode/utypes.h"
+#include "vm/DateTime.h"
+#include "vm/GlobalObject.h"
+#include "vm/Interpreter.h"
+#include "vm/Stack.h"
+#include "vm/StringBuffer.h"
 
 #include "jsobjinlines.h"
 
 using namespace js;
 
 using mozilla::IsFinite;
 using mozilla::IsNegativeZero;
 
--- a/js/src/builtin/Iterator-inl.h
+++ b/js/src/builtin/Iterator-inl.h
@@ -3,16 +3,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 builtin_Iterator_inl_h
 #define builtin_Iterator_inl_h
 
 #include "jsiter.h"
+
 #include "vm/ObjectImpl-inl.h"
 
 inline void
 js::PropertyIteratorObject::setNativeIterator(js::NativeIterator *ni)
 {
     setPrivate(ni);
 }
 
--- a/js/src/builtin/ParallelArray.cpp
+++ b/js/src/builtin/ParallelArray.cpp
@@ -1,19 +1,19 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * 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 "builtin/ParallelArray.h"
+
 #include "jsapi.h"
 #include "jsobj.h"
 
-#include "builtin/ParallelArray.h"
-
 #include "vm/GlobalObject.h"
 #include "vm/String.h"
 
 #include "jsobjinlines.h"
 
 using namespace js;
 
 //
--- a/js/src/builtin/Profilers.cpp
+++ b/js/src/builtin/Profilers.cpp
@@ -10,18 +10,18 @@
 
 #include <stdarg.h>
 
 #ifdef MOZ_CALLGRIND
 #include <valgrind/callgrind.h>
 #endif
 
 #ifdef __APPLE__
+#include "devtools/Instruments.h"
 #include "devtools/sharkctl.h"
-#include "devtools/Instruments.h"
 #endif
 
 #include "jscntxtinlines.h"
 
 using namespace js;
 
 using mozilla::ArrayLength;
 
@@ -440,19 +440,19 @@ js_DumpCallgrind(const char *outfile)
  * If you include --pid or --output in MOZ_PROFILE_PERF_FLAGS, you're just
  * asking for trouble.
  *
  * Our split-on-spaces logic is lame, so don't expect MOZ_PROFILE_PERF_FLAGS to
  * work if you pass an argument which includes a space (e.g.
  * MOZ_PROFILE_PERF_FLAGS="-e 'foo bar'").
  */
 
+#include <signal.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <signal.h>
 
 static bool perfInitialized = false;
 static pid_t perfPid = 0;
 
 JSBool js_StartPerf()
 {
     const char *outfile = "mozperf.data";