Backed out changeset f879c54dffae: 5efcb9c3b375 introduced more JSAPI users that need fixing for the <stdint.h> types, and it's not worth trying to do fixups for that commit now while holding the tree closed. uint32/JSUint32 type removals will occur later today, after I reopen up a CLOSED TREE.

js/src/jsapi-tests/Makefile.in

@@ -70,7 +70,6 @@ CPPSRCS = \
   testGetPropertyDefault.cpp \
   testIndexToString.cpp \
   testIntString.cpp \
-  testIntTypesABI.cpp \
   testIntern.cpp \
   testLookup.cpp \
   testLooselyEqual.cpp \

js/src/jsapi-tests/testIntTypesABI.cpp

@@ -1,65 +0,0 @@
-#include "tests.h"
-
-/*
- * This test exercises the full, deliberately-exposed JSAPI interface to ensure
- * that no internal integer typedefs leak out.  Include every intentionally
- * public header file (and those headers included by them, for completeness),
- * even the ones tests.h itself included, to verify this.
- */
-#include "js-config.h"
-#include "jsapi.h"
-#include "jsclass.h"
-#include "jscompat.h"
-#include "jscpucfg.h"
-#include "jspubtd.h"
-#include "jsstdint.h"
-#include "jstypes.h"
-#include "jsval.h"
-#include "jsxdrapi.h"
-
-#include "js/HashTable.h"
-#include "js/TemplateLib.h"
-#include "js/Utility.h"
-#include "js/Vector.h"
-
-/*
- * Verify that our public (and intended to be public, versus being that way
- * because we haven't made them private yet) headers don't define
- * {u,}int{8,16,32,64} or JS{Ui,I}nt{8,16,32,64} types.  If any do, they will
- * assuredly conflict with a corresponding typedef below mapping to a *struct*.
- *
- * Note that tests.h includes a few internal headers; in order that this
- * jsapi-test be writable, those internal headers must not import the legacy
- * typedefs.
- */
-
-struct ConflictingType {
-    uint64_t u64;
-};
-
-typedef ConflictingType uint8;
-typedef ConflictingType uint16;
-typedef ConflictingType uint32;
-typedef ConflictingType uint64;
-
-typedef ConflictingType int8;
-typedef ConflictingType int16;
-typedef ConflictingType int32;
-typedef ConflictingType int64;
-
-typedef ConflictingType JSUint8;
-typedef ConflictingType JSUint16;
-typedef ConflictingType JSUint32;
-typedef ConflictingType JSUint64;
-
-typedef ConflictingType JSInt8;
-typedef ConflictingType JSInt16;
-typedef ConflictingType JSInt32;
-typedef ConflictingType JSInt64;
-
-BEGIN_TEST(testIntTypesABI)
-{
-    /* This passes if the typedefs didn't conflict at compile time. */
-    return true;
-}
-END_TEST(testIntTypesABI)

js/src/jsapi.h

@@ -44,7 +44,7 @@
  * JavaScript API.
  */
 
-#include "mozilla/StdInt.h"
+#include "js/LegacyIntTypes.h"
 
 #include <stddef.h>
 #include <stdio.h>