Bug 909171 (part 2) - Fix up jsversion.h includes. r=luke.

--HG--
extra : rebase_source : 2938ddad7ae8f9ea4069847688f461fa5caed40e

js/src/frontend/Parser.cpp

@@ -27,7 +27,6 @@
 #include "jsopcode.h"
 #include "jsscript.h"
 #include "jstypes.h"
-#include "jsversion.h"
 
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/FoldConstants.h"

js/src/frontend/TokenStream.h

@@ -18,7 +18,6 @@
 
 #include "jscntxt.h"
 #include "jspubtd.h"
-#include "jsversion.h"
 
 #include "js/Vector.h"
 #include "vm/RegExpObject.h"

js/src/js-confdefs.h.in

@@ -3,11 +3,11 @@
  * Do not edit.
  */
 
-#ifndef _JS_CONFDEFS_H_
-#define _JS_CONFDEFS_H_
+#ifndef js_confdefs_h
+#define js_confdefs_h
 
 @ALLDEFINES@
 
 #include "js/RequiredDefines.h"
 
-#endif /* _JS_CONFDEFS_H_ */
+#endif /* js_confdefs_h */

js/src/js-config.h.in

@@ -5,8 +5,8 @@
  * 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 js_config_h___
-#define js_config_h___
+#ifndef js_config_h
+#define js_config_h
 
 /* Definitions set at build time that affect SpiderMonkey's public API.
    This header file is generated by the SpiderMonkey configure script,
@@ -42,4 +42,4 @@
 #undef MOZJS_MAJOR_VERSION
 #undef MOZJS_MINOR_VERSION
 
-#endif /* js_config_h___ */
+#endif /* js_config_h */

js/src/jsapi.h

@@ -18,7 +18,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "js-config.h"
 #include "jsalloc.h"
 #include "jspubtd.h"
 

js/src/jsstr.cpp

@@ -37,7 +37,6 @@
 #include "jsopcode.h"
 #include "jstypes.h"
 #include "jsutil.h"
-#include "jsversion.h"
 
 #include "builtin/RegExp.h"
 #include "vm/GlobalObject.h"

js/src/jstypes.h

@@ -24,7 +24,14 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Types.h"
 
+// jstypes.h is (or should be!) included by every file in SpiderMonkey.
+// js-config.h and jsversion.h also should be included by every file.
+// So include them here.
+// XXX: including them in js/RequiredDefines.h should be a better option, since
+// that is by definition the header file that should be included in all
+// SpiderMonkey code.  However, Gecko doesn't do this!  See bug 909576.
 #include "js-config.h"
+#include "jsversion.h"
 
 /***********************************************************************
 ** MACROS:      JS_EXTERN_API

js/src/vm/CommonPropertyNames.h

@@ -10,7 +10,6 @@
 #define vm_CommonPropertyNames_h
 
 #include "jsprototypes.h"
-#include "jsversion.h"
 
 #define FOR_EACH_COMMON_PROPERTYNAME(macro) \
     macro(anonymous, anonymous, "anonymous") \

js/src/vm/Keywords.h

@@ -9,8 +9,6 @@
 #ifndef vm_Keywords_h
 #define vm_Keywords_h
 
-#include "jsversion.h"
-
 #if JS_HAS_CONST
 #  define FOR_CONST_KEYWORD(macro) \
       macro(const, const_, TOK_CONST, JSVERSION_DEFAULT)

js/src/vm/TypedArrayObject.cpp

@@ -23,7 +23,6 @@
 #include "jsobj.h"
 #include "jstypes.h"
 #include "jsutil.h"
-#include "jsversion.h"
 #ifdef XP_WIN
 # include "jswin.h"
 #endif