diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /intl/uconv | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'intl/uconv')
| -rw-r--r-- | intl/uconv/nsConverterInputStream.cpp | 2 | ||||
| -rw-r--r-- | intl/uconv/nsIScriptableUConv.idl | 6 | ||||
| -rw-r--r-- | intl/uconv/nsITextToSubURI.idl | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/intl/uconv/nsConverterInputStream.cpp b/intl/uconv/nsConverterInputStream.cpp index e3efdbc146..96fad345b2 100644 --- a/intl/uconv/nsConverterInputStream.cpp +++ b/intl/uconv/nsConverterInputStream.cpp @@ -42,7 +42,7 @@ nsConverterInputStream::Init(nsIInputStream* aStream, const char* aCharset, aBufferSize = CONVERTER_BUFFER_SIZE; outputBufferSize = CONVERTER_BUFFER_SIZE; } else { - // NetUtil.jsm assumes that if buffer size equals + // NetUtil.sys.mjs assumes that if buffer size equals // the input size, the whole stream will be processed // as one readString. This is not true with encoding_rs, // because encoding_rs might want to see space for a diff --git a/intl/uconv/nsIScriptableUConv.idl b/intl/uconv/nsIScriptableUConv.idl index 7f1334c0c3..8dc59ae1db 100644 --- a/intl/uconv/nsIScriptableUConv.idl +++ b/intl/uconv/nsIScriptableUConv.idl @@ -7,12 +7,6 @@ interface nsIInputStream; -%{C++ -// {0A698C44-3BFF-11d4-9649-00C0CA135B4E} -#define NS_ISCRIPTABLEUNICODECONVERTER_CID { 0x0A698C44, 0x3BFF, 0x11d4, { 0x96, 0x49, 0x00, 0xC0, 0xCA, 0x13, 0x5B, 0x4E } } -#define NS_ISCRIPTABLEUNICODECONVERTER_CONTRACTID "@mozilla.org/intl/scriptableunicodeconverter" -%} - /** * In new code, please use the WebIDL TextDecoder and TextEncoder * instead. They represent bytes as Uint8Array (or as view to such diff --git a/intl/uconv/nsITextToSubURI.idl b/intl/uconv/nsITextToSubURI.idl index 3bb404e414..7e0d598477 100644 --- a/intl/uconv/nsITextToSubURI.idl +++ b/intl/uconv/nsITextToSubURI.idl @@ -7,8 +7,6 @@ %{C++ -// {8B042E22-6F87-11d3-B3C8-00805F8A6670} -#define NS_TEXTTOSUBURI_CID { 0x8b042e22, 0x6f87, 0x11d3, { 0xb3, 0xc8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 } } #define NS_ITEXTTOSUBURI_CONTRACTID "@mozilla.org/intl/texttosuburi;1" %} |