Bug 888088 (part 12) - Fix #include ordering in a handful of remaining places. r=nnethercote.
authorEmanuel Hoogeveen <emanuel.hoogeveen@gmail.com>
Thu, 25 Jul 2013 19:13:55 -0700
changeset 140129 5f7fcbc8fd2777d5767ef1364658455bcacbbcc0
parent 140128 df8423fdcad845e23ee1f2a3d2f8f13c67142c1a
child 140130 6b4ff981027f3232bf23cd598fa848d57b064b48
push id25016
push userryanvm@gmail.com
push dateSat, 27 Jul 2013 02:25:56 +0000
treeherdermozilla-central@fb48c7d58b8b [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 12) - Fix #include ordering in a handful of remaining places. r=nnethercote.
js/src/ion/IonCaches.h
js/src/ion/LIR.h
js/src/jsclass.h
js/src/jsclone.cpp
js/src/prmjtime.cpp
js/src/prmjtime.h
js/src/vm/ForkJoin.cpp
--- a/js/src/ion/IonCaches.h
+++ b/js/src/ion/IonCaches.h
@@ -2,22 +2,22 @@
  * 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/. */
 
 #ifndef ion_IonCaches_h
 #define ion_IonCaches_h
 
+#ifdef JS_CPU_ARM
+# include "ion/arm/Assembler-arm.h"
+#endif
 #include "ion/IonCode.h"
 #include "ion/Registers.h"
 #include "ion/shared/Assembler-shared.h"
-#ifdef JS_CPU_ARM
-# include "ion/arm/Assembler-arm.h"
-#endif
 #include "vm/ForkJoin.h"
 
 class JSFunction;
 class JSScript;
 
 namespace js {
 
 class TypedArrayObject;
--- a/js/src/ion/LIR.h
+++ b/js/src/ion/LIR.h
@@ -13,18 +13,18 @@
 #include "mozilla/Array.h"
 
 #include "jscntxt.h"
 
 #include "ion/Bailouts.h"
 #include "ion/InlineList.h"
 #include "ion/IonAllocPolicy.h"
 #include "ion/LOpcodes.h"
+#include "ion/MIR.h"
 #include "ion/MIRGraph.h"
-#include "ion/MIR.h"
 #include "ion/Registers.h"
 #include "ion/Safepoints.h"
 #include "ion/shared/Assembler-shared.h"
 #include "ion/VMFunctions.h"
 
 namespace js {
 namespace ion {
 
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.h
@@ -214,17 +214,17 @@ typedef void
     JSCheckAccessOp     checkAccess;                                          \
     JSNative            call;                                                 \
     JSHasInstanceOp     hasInstance;                                          \
     JSNative            construct;                                            \
     JSTraceOp           trace
 
 /*
  * The helper struct to measure the size of JS_CLASS_MEMBERS to know how much
- * we have to padd js::Class to match the size of JSClass;
+ * we have to pad js::Class to match the size of JSClass.
  */
 struct ClassSizeMeasurement
 {
     JS_CLASS_MEMBERS;
 };
 
 struct ClassExtension
 {
--- a/js/src/jsclone.cpp
+++ b/js/src/jsclone.cpp
@@ -23,22 +23,22 @@
  *
  * So during writing, we add objects to the memory when first encountering
  * them. When reading a typed array, a placeholder is pushed onto allObjs until
  * the ArrayBuffer has been read, then it is updated with the actual typed
  * array object.
  */
 
 #include "jsclone.h"
-#include "jswrapper.h"
 
 #include "mozilla/Endian.h"
 #include "mozilla/FloatingPoint.h"
 
 #include "jsdate.h"
+#include "jswrapper.h"
 
 #include "vm/TypedArrayObject.h"
 #include "vm/WrapperObject.h"
 
 #include "jscntxtinlines.h"
 #include "jsobjinlines.h"
 
 using namespace js;
--- a/js/src/prmjtime.cpp
+++ b/js/src/prmjtime.cpp
@@ -1,29 +1,30 @@
 /* -*- 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/. */
 
 /* PR time code. */
 
+#include "prmjtime.h"
+
 #include "mozilla/MathAlgorithms.h"
 
 #ifdef SOLARIS
 #define _REENTRANT 1
 #endif
 #include <string.h>
 #include <time.h>
 
+#include "jslock.h"
 #include "jsprf.h"
-#include "jslock.h"
 #include "jstypes.h"
 #include "jsutil.h"
-#include "prmjtime.h"
 
 #define PRMJ_DO_MILLISECONDS 1
 
 #ifdef XP_OS2
 #include <sys/timeb.h>
 #endif
 #ifdef XP_WIN
 #include <windef.h>
--- a/js/src/prmjtime.h
+++ b/js/src/prmjtime.h
@@ -2,16 +2,18 @@
  * 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/. */
 
 #ifndef prmjtime_h
 #define prmjtime_h
 
+#include "mozilla/StandardInteger.h"
+
 #include <time.h>
 
 /*
  * Broken down form of 64 bit time value.
  */
 struct PRMJTime {
     int32_t tm_usec;            /* microseconds of second (0-999999) */
     int8_t tm_sec;              /* seconds of minute (0-59) */
--- a/js/src/vm/ForkJoin.cpp
+++ b/js/src/vm/ForkJoin.cpp
@@ -1,17 +1,17 @@
 /* -*- 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 "jscntxt.h"
+#include "vm/ForkJoin.h"
 
-#include "vm/ForkJoin.h"
+#include "jscntxt.h"
 
 #ifdef JS_THREADSAFE
 # include "prthread.h"
 # include "prprf.h"
 # include "ion/BaselineJIT.h"
 # include "vm/Monitor.h"
 #endif