Bug 956601 - Add Char16.h to RequiredDefines.h so that SpiderMonkey standalone works again, in compilers without native char16_t support. r=sstangl
authorJeff Walden <jwalden@mit.edu>
Sun, 05 Jan 2014 18:05:11 -0600
changeset 162295 b3ae449c47ec91a26e9da135acc7d7a0c606ad80
parent 162294 a6330cc7cc46ab4190a7d1265f9dc6f0d6db930b
child 162296 3b169432bbf7c3c0259280a19f54014acf52eb32
push idunknown
push userunknown
push dateunknown
reviewerssstangl
bugs956601
milestone29.0a1
Bug 956601 - Add Char16.h to RequiredDefines.h so that SpiderMonkey standalone works again, in compilers without native char16_t support. r=sstangl
js/public/RequiredDefines.h
js/src/js-confdefs.h.in
--- a/js/public/RequiredDefines.h
+++ b/js/public/RequiredDefines.h
@@ -23,9 +23,12 @@
  * (INT8_C for example) used to specify a literal constant of the proper type,
  * and with __STDC_FORMAT_MACROS for the format macros (PRId32 for example) used
  * with the fprintf function family.
  */
 #define __STDC_LIMIT_MACROS
 #define __STDC_CONSTANT_MACROS
 #define __STDC_FORMAT_MACROS
 
+/* Also define a char16_t type if not provided by the compiler. */
+#include "mozilla/Char16.h"
+
 #endif /* js_RequiredDefines_h */
--- a/js/src/js-confdefs.h.in
+++ b/js/src/js-confdefs.h.in
@@ -5,11 +5,9 @@
 
 #ifndef js_confdefs_h
 #define js_confdefs_h
 
 @ALLDEFINES@
 
 #include "js/RequiredDefines.h"
 
-#include "mozilla/Char16.h"
-
 #endif /* js_confdefs_h */