From d49f9553b164a22315c19f6ffa53fc36c2b4fb9e Mon Sep 17 00:00:00 2001
From: Brendan Eich <brendan@mozilla.org>
Date: Thu, 10 Sep 2009 10:23:52 -0700
Subject: [PATCH] Fix js*inlines.h harder (515628, r=jorendorff).

---
 js/src/jsatominlines.h   | 4 ----
 js/src/jsobj.cpp         | 1 +
 js/src/jsscript.cpp      | 1 +
 js/src/jsscriptinlines.h | 1 +
 js/src/jstracer.cpp      | 3 ++-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/src/jsatominlines.h b/js/src/jsatominlines.h
index 9c0c01fc26..277657ddeb 100644
--- a/js/src/jsatominlines.h
+++ b/js/src/jsatominlines.h
@@ -43,8 +43,6 @@
 #include "jsatom.h"
 #include "jsnum.h"
 
-JS_BEGIN_EXTERN_C
-
 /*
  * Convert v to an atomized string and wrap it as an id.
  */
@@ -94,6 +92,4 @@ js_Int32ToId(JSContext* cx, int32 index, jsid* id)
     return js_ValueToStringId(cx, STRING_TO_JSVAL(str), id);
 }
 
-JS_END_EXTERN_C
-
 #endif /* jsatom_inlines_h___ */
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 8421bb3d35..6fab18f738 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -69,6 +69,7 @@
 #include "jsparse.h"
 #include "jsscope.h"
 #include "jsscript.h"
+#include "jsscriptinlines.h"
 #include "jsstaticcheck.h"
 #include "jsstr.h"
 #include "jstracer.h"
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 29a39d6940..fb99be70c9 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -60,6 +60,7 @@
 #include "jsparse.h"
 #include "jsscope.h"
 #include "jsscript.h"
+#include "jsscriptinlines.h"
 #include "jstracer.h"
 #if JS_HAS_XDR
 #include "jsxdrapi.h"
diff --git a/js/src/jsscriptinlines.h b/js/src/jsscriptinlines.h
index 1cb586c534..227cc2e344 100644
--- a/js/src/jsscriptinlines.h
+++ b/js/src/jsscriptinlines.h
@@ -43,6 +43,7 @@
 
 #include "jsfun.h"
 #include "jsregexp.h"
+#include "jsscript.h"
 
 inline JSFunction *
 JSScript::getFunction(size_t index)
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 5de0466c38..33a02ec731 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -60,6 +60,7 @@
 #include "jsarray.h"
 #include "jsbool.h"
 #include "jscntxt.h"
+#include "jsdate.h"
 #include "jsdbgapi.h"
 #include "jsemit.h"
 #include "jsfun.h"
@@ -71,7 +72,7 @@
 #include "jsregexp.h"
 #include "jsscope.h"
 #include "jsscript.h"
-#include "jsdate.h"
+#include "jsscriptinlines.h"
 #include "jsstaticcheck.h"
 #include "jstracer.h"
 #include "jsxml.h"
-- 
2.11.4.GIT