Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1 insertions, 27 deletions

diff --git a/xpcom/base/nsrootidl.idl b/xpcom/base/nsrootidl.idl
index 292ea54890..364d0b75eb 100644
--- a/xpcom/base/nsrootidl.idl
+++ b/xpcom/base/nsrootidl.idl
@@ -11,7 +11,6 @@
 
 #include "nscore.h"
 #include "nsID.h"
-typedef int64_t PRTime;
 
 /*
  * Forward declarations for new string types
@@ -29,27 +28,9 @@ class Promise;
 } // namespace dom
 } // namespace mozilla
 
-/*
- * Start commenting out the C++ versions of the below in the output header
- */
-#if 0
 %}
 
-// [substitute] typedefs emit the underlying builtin type directly, and
-// avoid polluting bindings for other languages with C++ stdint types.
-
-[substitute]  typedef boolean             bool     ;
-[substitute]  typedef octet               uint8_t  ;
-[substitute]  typedef unsigned short      uint16_t ;
-[substitute]  typedef unsigned long       uint32_t ;
-[substitute]  typedef unsigned long long  uint64_t ;
-[substitute]  typedef short               int16_t  ;
-[substitute]  typedef long                int32_t  ;
-[substitute]  typedef long long           int64_t  ;
-
-              typedef unsigned short      char16_t ;
-              typedef unsigned long       nsresult ;
-              typedef long long           PRTime   ;
+typedef long long PRTime;
 
 // If we ever want to use `size_t` in scriptable interfaces, this will need to
 // be built into the xpidl compiler, as the size varies based on platform.
@@ -99,10 +80,3 @@ class Promise;
               native jsid(jsid);
 
 [ptr, promise] native Promise(ignored);
-
-%{C++
-/*
- * End commenting out the C++ versions of the above in the output header
- */
-#endif
-%}