Bug 888088 (part 2) - Fix #include ordering in js/src/ctypes/. r=nnethercote.
authorNicholas Nethercote <nnethercote@mozilla.com>
Tue, 23 Jul 2013 17:34:18 -0700
changeset 152029 695e5051cad27bd46e6ec4397b0b2318669aaa3b
parent 152028 ab30741c56548fd069e76abbbd39ea7090aecd52
child 152030 055b807e6a4b29e9b1b12609acde8332f35d045e
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 2) - Fix #include ordering in js/src/ctypes/. r=nnethercote.
js/src/ctypes/CTypes.h
js/src/ctypes/Library.cpp
--- a/js/src/ctypes/CTypes.h
+++ b/js/src/ctypes/CTypes.h
@@ -1,20 +1,20 @@
 /* -*-  Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
 /* 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 ctypes_CTypes_h
 #define ctypes_CTypes_h
 
-#include "jscntxt.h"
+#include "ffi.h"
 #include "jsapi.h"
+#include "jscntxt.h"
 #include "prlink.h"
-#include "ffi.h"
 
 #include "js/HashTable.h"
 
 namespace js {
 namespace ctypes {
 
 /*******************************************************************************
 ** Utility classes
--- a/js/src/ctypes/Library.cpp
+++ b/js/src/ctypes/Library.cpp
@@ -1,19 +1,21 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * vim: set ts=2 sw=2 et 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 "ctypes/Library.h"
+
 #include "jscntxt.h"
 #include "jsstr.h"
-#include "ctypes/Library.h"
+#include "prlink.h"
+
 #include "ctypes/CTypes.h"
-#include "prlink.h"
 
 namespace js {
 namespace ctypes {
 
 /*******************************************************************************
 ** JSAPI function prototypes
 *******************************************************************************/