[gjs/mozjs91: 50/60] JS_StringHasLatin1Chars -> JS::StringHasLatin1Chars




commit e05800fb55c34653bb4bfd98ac985cbd35e781e9
Author: Evan Welsh <contact evanwelsh com>
Date:   Sat Jul 10 20:25:36 2021 -0700

    JS_StringHasLatin1Chars -> JS::StringHasLatin1Chars

 gjs/byteArray.cpp | 6 ++++--
 gjs/gjs_pch.hh    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gjs/byteArray.cpp b/gjs/byteArray.cpp
index 05c25034..453e059a 100644
--- a/gjs/byteArray.cpp
+++ b/gjs/byteArray.cpp
@@ -13,11 +13,13 @@
 
 #include <js/ArrayBuffer.h>
 #include <js/CallArgs.h>
+#include <js/CharacterEncoding.h>
 #include <js/GCAPI.h>  // for AutoCheckCannotGC
 #include <js/PropertySpec.h>
 #include <js/RootingAPI.h>
+#include <js/String.h>
 #include <js/TypeDecls.h>
-#include <js/Utility.h>   // for UniqueChars
+#include <js/Utility.h>  // for UniqueChars
 #include <js/experimental/TypedData.h>
 #include <jsapi.h>        // for JS_DefineFunctionById, JS_DefineFun...
 #include <jsfriendapi.h>  // for JS_NewUint8ArrayWithBuffer, GetUint...
@@ -164,7 +166,7 @@ from_string_func(JSContext *context,
             JS::AutoCheckCannotGC nogc;
             size_t len;
 
-            if (JS_StringHasLatin1Chars(str)) {
+            if (JS::StringHasLatin1Chars(str)) {
                 const JS::Latin1Char *chars =
                     JS_GetLatin1StringCharsAndLength(context, nogc, str, &len);
                 if (chars == NULL)
diff --git a/gjs/gjs_pch.hh b/gjs/gjs_pch.hh
index 0e79f1c6..60519829 100644
--- a/gjs/gjs_pch.hh
+++ b/gjs/gjs_pch.hh
@@ -85,6 +85,7 @@
 #include <js/RootingAPI.h>
 #include <js/SavedFrameAPI.h>
 #include <js/SourceText.h>
+#include <js/String.h>
 #include <js/Symbol.h>
 #include <js/TracingAPI.h>
 #include <js/TypeDecls.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]