Compile with -D__STDC_LIMIT_MACROS to avoid having to fight with system headers over which includes stdint.h first. irc-r=jimb,Waldo

js/src/Makefile.in

@@ -434,7 +434,13 @@ distclean::
 export::
 	mkdir -p nanojit
 
-DEFINES		+= -DEXPORT_JS_API 
+DEFINES		+= -DEXPORT_JS_API
+
+# Some platforms that have stdint.h include it in system headers.  So
+# to reliably get limit macros defined, we'd always have to define the
+# one below before including any header, but that's obscure and
+# fragile, so we do it here.
+DEFINES		+= -D__STDC_LIMIT_MACROS
 
 INCLUDES	+= -I$(srcdir)
 

js/src/jscntxt.cpp

@@ -38,8 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#define __STDC_LIMIT_MACROS
-
 /*
  * JS execution context.
  */

js/src/jsnum.cpp

@@ -38,8 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#define __STDC_LIMIT_MACROS
-
 /*
  * JS number type and wrapper class.
  */

js/src/jsobj.cpp

@@ -41,8 +41,6 @@
 /*
  * JS object implementation.
  */
-#define __STDC_LIMIT_MACROS
-
 #include <stdlib.h>
 #include <string.h>
 #include "jstypes.h"

js/src/jsstr.cpp

@@ -48,8 +48,6 @@
  * of rooting things that might lose their newborn root due to subsequent GC
  * allocations in the same native method.
  */
-#define __STDC_LIMIT_MACROS
-
 #include <stdlib.h>
 #include <string.h>
 #include "jstypes.h"

js/src/jstypedarray.cpp

@@ -37,8 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#define __STDC_LIMIT_MACROS
-
 #include <string.h>
 
 #include "jstypes.h"

js/src/prmjtime.cpp

@@ -46,9 +46,7 @@
 #include <string.h>
 #include <time.h>
 
-#define __STDC_LIMIT_MACROS
 #include "jsstdint.h"
-
 #include "jstypes.h"
 #include "jsutil.h"