[gjs] Strip compat.h #define hell
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] Strip compat.h #define hell
- Date: Mon, 28 Nov 2011 19:45:52 +0000 (UTC)
commit f8d1e992b1cd68f4b4069f558f55b8d05acd8053
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Nov 18 17:25:52 2011 -0500
Strip compat.h #define hell
https://bugzilla.gnome.org/show_bug.cgi?id=664360
configure.ac | 19 -------------
gi/boxed.c | 2 -
gi/keep-alive.c | 6 ----
gi/object.c | 2 -
gjs/byteArray.c | 11 -------
gjs/compat.h | 58 ---------------------------------------
gjs/context.c | 2 -
gjs/importer.c | 2 -
gjs/jsapi-util-array.c | 19 +------------
gjs/jsapi-util-error.c | 16 +---------
gjs/jsapi-util-string.c | 69 +++++++++++-----------------------------------
gjs/jsapi-util.c | 20 -------------
gjs/profiler.c | 17 ++++-------
gjs/stack.c | 8 -----
modules/console.c | 12 --------
modules/lang.c | 5 ---
16 files changed, 26 insertions(+), 242 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6c5c5a1..a16b04c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,25 +95,6 @@ AC_CHECK_FUNCS(mallinfo)
echo "Using JS_CFLAGS: $JS_CFLAGS"
echo "Using JS_LIBS: $JS_LIBS"
-saved_CFLAGS=$CFLAGS
-saved_LIBS=$LIBS
-CFLAGS=$JS_CFLAGS
-LIBS=$JS_LIBS
-AC_CHECK_FUNC([JS_GetStringBytes], AC_DEFINE([HAVE_JS_GETSTRINGBYTES], [1], [Define if we still have JS_GetStringBytes]),)
-AC_CHECK_FUNC([JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], [1], [Define if we still have JS_GetFunctionName]),)
-AC_CHECK_FUNC([JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),)
-AC_CHECK_FUNC([JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),)
-AC_CHECK_FUNC([JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),)
-AC_CHECK_FUNC([JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),)
-AC_CHECK_FUNC([JS_DecodeUTF8], AC_DEFINE([HAVE_JS_DECODEUTF8], [1], [Define if we have JS_DecodeUTF8]),)
-AC_CHECK_FUNC([JS_FreezeObject], AC_DEFINE([HAVE_JS_FREEZEOBJECT], [1], [Define if we have JS_FreezeObject]),)
-AC_CHECK_FUNC([JS_IsScriptFrame], AC_DEFINE([HAVE_JS_ISSCRIPTFRAME], [1], [Define if we have JS_IsScriptFrame]),)
-AC_CHECK_FUNC([JS_NewCompartmentAndGlobalObject], AC_DEFINE([HAVE_JS_NEWCOMPARTMENTANDGLOBALOBJECT], [1], [Define if we have JS_NewCompartmentAndGlobalObject]),)
-AC_CHECK_FUNC([JS_SetScriptStackQuota], AC_DEFINE([HAVE_JS_SETSCRIPTSTACKQUOTA], [1], [Define if we have JS_SetScriptStackQuota]),)
-AC_CHECK_FUNC([JS_ClearNewbornRoots], AC_DEFINE([HAVE_JS_CLEARNEWBORNROOTS], [1], [Define if we have JS_ClearNewbornRoots]),)
-CFLAGS=$saved_CFLAGS
-LIBS=$saved_LIBS
-
AC_MSG_CHECKING([whether JSLocaleToUnicode takes a const char*])
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $JS_CFLAGS -Wno-unused -Werror"
diff --git a/gi/boxed.c b/gi/boxed.c
index 2edb2fc..ef80395 100644
--- a/gi/boxed.c
+++ b/gi/boxed.c
@@ -792,9 +792,7 @@ static JSBool
boxed_field_setter (JSContext *context,
JSObject *obj,
jsid id,
-#ifdef HAVE_JS_STRICTPROPERTYSTUB
JSBool strict,
-#endif
jsval *value)
{
Boxed *priv;
diff --git a/gi/keep-alive.c b/gi/keep-alive.c
index 7553918..5f9d64f 100644
--- a/gi/keep-alive.c
+++ b/gi/keep-alive.c
@@ -178,9 +178,7 @@ keep_alive_trace(JSTracer *tracer,
*/
static struct JSClass gjs_keep_alive_class = {
"__private_GjsKeepAlive", /* means "new __private_GjsKeepAlive()" works */
-#ifdef HAVE_JS_CLASS_TRACE
JSCLASS_MARK_IS_TRACE | /* TraceOp not MarkOp */
-#endif
JSCLASS_HAS_PRIVATE,
JS_PropertyStub,
JS_PropertyStub,
@@ -196,11 +194,7 @@ static struct JSClass gjs_keep_alive_class = {
NULL,
NULL,
NULL,
-#ifdef HAVE_JS_CLASS_TRACE
JS_CLASS_TRACE(keep_alive_trace),
-#else
- keep_alive_trace,
-#endif
NULL
};
diff --git a/gi/object.c b/gi/object.c
index 7650c5f..7b7ceb5 100644
--- a/gi/object.c
+++ b/gi/object.c
@@ -182,9 +182,7 @@ static JSBool
object_instance_set_prop(JSContext *context,
JSObject *obj,
jsid id,
-#ifdef HAVE_JS_STRICTPROPERTYSTUB
JSBool strict,
-#endif
jsval *value_p)
{
ObjectInstance *priv;
diff --git a/gjs/byteArray.c b/gjs/byteArray.c
index 02c627f..56b9e5f 100644
--- a/gjs/byteArray.c
+++ b/gjs/byteArray.c
@@ -45,9 +45,7 @@ static JSBool byte_array_get_prop (JSContext *context,
static JSBool byte_array_set_prop (JSContext *context,
JSObject *obj,
jsid id,
-#ifdef HAVE_JS_STRICTPROPERTYSTUB
JSBool strict,
-#endif
jsval *value_p);
static JSBool byte_array_new_resolve (JSContext *context,
JSObject *obj,
@@ -240,9 +238,7 @@ static JSBool
byte_array_length_setter(JSContext *context,
JSObject *obj,
jsid id,
-#ifdef HAVE_JS_STRICTPROPERTYSTUB
JSBool strict,
-#endif
jsval *value_p)
{
ByteArrayInstance *priv;
@@ -302,9 +298,7 @@ static JSBool
byte_array_set_prop(JSContext *context,
JSObject *obj,
jsid id,
-#ifdef HAVE_JS_STRICTPROPERTYSTUB
JSBool strict,
-#endif
jsval *value_p)
{
ByteArrayInstance *priv;
@@ -687,14 +681,9 @@ from_string_func(JSContext *context,
const jschar *u16_chars;
gsize u16_len;
-#ifdef HAVE_JS_GETSTRINGCHARS
- u16_chars = JS_GetStringChars(JSVAL_TO_STRING(argv[0]));
- u16_len = JS_GetStringLength(JSVAL_TO_STRING(argv[0]));
-#else
u16_chars = JS_GetStringCharsAndLength(context, JSVAL_TO_STRING(argv[0]), &u16_len);
if (u16_chars == NULL)
goto out;
-#endif
error = NULL;
encoded = g_convert((char*) u16_chars,
diff --git a/gjs/compat.h b/gjs/compat.h
index e06c1ef..e05b145 100644
--- a/gjs/compat.h
+++ b/gjs/compat.h
@@ -38,35 +38,6 @@ G_BEGIN_DECLS
* See https://bugzilla.gnome.org/show_bug.cgi?id=622896 for some initial discussion.
*/
-/* The old JS_AddRoot accepted anything via void *, new
- * api is stricter.
- * Upstream commit 2fc2a12a4565, Spidermonkey >= Jun 07 2010
- */
-#ifndef JS_TYPED_ROOTING_API
-#define JS_AddValueRoot JS_AddRoot
-#define JS_AddObjectRoot JS_AddRoot
-#define JS_AddStringRoot JS_AddRoot
-#define JS_AddGCThingRoot JS_AddRoot
-#define JS_RemoveValueRoot JS_RemoveRoot
-#define JS_RemoveObjectRoot JS_RemoveRoot
-#define JS_RemoveStringRoot JS_RemoveRoot
-#define JS_RemoveGCThingRoot JS_RemoveRoot
-#endif
-
-/* commit 5ad4532aa996, Spidermonkey > Jun 17 2010
- * This one is complex; jsid appears to be explicitly
- * different from JSVAL now. If we're on an old xulrunner,
- * define JSID_IS_VOID in a compatible way.
- */
-#ifndef JSID_VOID
-#define JSID_VOID JSVAL_VOID
-#define JSID_IS_VOID(id) (id == JSVAL_VOID)
-#define INT_TO_JSID(i) ((jsid) INT_TO_JSVAL(i))
-#endif
-
-/* commit 66c8ad02543b, Spidermonkey > Aug 16 2010
- * "Slow natives" */
-#ifdef JSFUN_CONSTRUCTOR
/* All functions are "fast", so define this to a no-op */
#define JSFUN_FAST_NATIVE 0
@@ -112,35 +83,6 @@ gjs_##name##_constructor(JSContext *context, \
*/
#define GJS_NATIVE_CONSTRUCTOR_FINISH(name) \
JS_SET_RVAL(context, vp, OBJECT_TO_JSVAL(object));
-#else
-
-#define GJS_NATIVE_CONSTRUCTOR_DECLARE(name) \
-static JSBool \
-gjs_##name##_constructor(JSContext *context, \
- JSObject *object, \
- uintN argc, \
- jsval *argv, \
- jsval *retval)
-
-#define GJS_NATIVE_CONSTRUCTOR_VARIABLES(name)
-
-#define GJS_NATIVE_CONSTRUCTOR_PRELUDE(name) \
- if (!JS_IsConstructing(context)) { \
- gjs_throw_constructor_error(context); \
- return JS_FALSE; \
- }
-
-#define GJS_NATIVE_CONSTRUCTOR_FINISH(name)
-
-#endif
-
-#ifndef HAVE_JS_STRICTPROPERTYSTUB
-#define JS_StrictPropertyStub JS_PropertyStub
-#endif
-
-#ifndef HAVE_JS_GETGLOBALFORSCOPECHAIN
-#define JS_GetGlobalForScopeChain JS_GetScopeChain
-#endif
G_END_DECLS
diff --git a/gjs/context.c b/gjs/context.c
index bb7a4cd..e107fe3 100644
--- a/gjs/context.c
+++ b/gjs/context.c
@@ -577,11 +577,9 @@ gjs_context_constructor (GType type,
JS_BeginRequest(js_context->context);
-#ifdef HAVE_JS_SETSCRIPTSTACKQUOTA
/* same as firefox, see discussion at
* https://bugzilla.mozilla.org/show_bug.cgi?id=420869 */
JS_SetScriptStackQuota(js_context->context, 100*1024*1024);
-#endif
/* JSOPTION_DONT_REPORT_UNCAUGHT: Don't send exceptions to our
* error report handler; instead leave them set. This allows us
diff --git a/gjs/importer.c b/gjs/importer.c
index ea92f78..7d4cc3a 100644
--- a/gjs/importer.c
+++ b/gjs/importer.c
@@ -734,9 +734,7 @@ importer_new_enumerate(JSContext *context,
ImporterIterator *iter;
switch (enum_op) {
-#ifdef HAVE_MOZJS_2
case JSENUMERATE_INIT_ALL:
-#endif
case JSENUMERATE_INIT: {
Importer *priv;
JSObject *search_path;
diff --git a/gjs/jsapi-util-array.c b/gjs/jsapi-util-array.c
index bcccf13..938293c 100644
--- a/gjs/jsapi-util-array.c
+++ b/gjs/jsapi-util-array.c
@@ -311,32 +311,15 @@ gjstest_test_func_gjs_jsapi_util_array(void)
gjs_rooted_array_append(context, array, value);
}
-#ifdef HAVE_JS_CLEARNEWBORNROOTS
JS_ClearNewbornRoots(context);
-#endif
JS_GC(context);
for (i = 0; i < N_ELEMS; i++) {
char *ascii;
- JSString *str;
value = gjs_rooted_array_get(context, array, i);
g_assert(JSVAL_IS_STRING(value));
- str = JSVAL_TO_STRING(value);
-#ifdef HAVE_JS_GETSTRINGBYTES
- ascii = g_strdup(JS_GetStringBytes(str));
-#else
- size_t len = JS_GetStringEncodingLength(context, str);
- if (len == (size_t)(-1))
- continue;
-
- ascii = g_malloc((len + 1) * sizeof(char));
- JS_EncodeStringToBuffer(str, ascii, len);
- ascii[len] = '\0';
-#endif
- /* if the string was freed, hopefully this will fail
- * even if we didn't crash yet
- */
+ ascii = gjs_string_get_ascii(context, value);
g_assert(strcmp(ascii, "abcdefghijk") == 0);
g_free(ascii);
}
diff --git a/gjs/jsapi-util-error.c b/gjs/jsapi-util-error.c
index 2dcdc73..56c8e6d 100644
--- a/gjs/jsapi-util-error.c
+++ b/gjs/jsapi-util-error.c
@@ -205,7 +205,6 @@ gjstest_test_func_gjs_jsapi_util_error_throw(void)
JSContext *context;
jsval exc, value, previous;
char *s = NULL;
- JSString *str;
int strcmp_result;
_gjs_unit_test_fixture_begin(&fixture);
@@ -226,19 +225,8 @@ gjstest_test_func_gjs_jsapi_util_error_throw(void)
&value);
g_assert(JSVAL_IS_STRING(value));
- str = JSVAL_TO_STRING(value);
-
-#ifdef HAVE_JS_GETSTRINGBYTES
- /* JS_GetStringBytes() is broken for non-ASCII but that's OK here */
- s = g_strdup(JS_GetStringBytes(str));
-#else
- size_t len = JS_GetStringEncodingLength(context, str);
- if (len != (size_t)(-1)) {
- s = g_malloc((len + 1) * sizeof(char));
- JS_EncodeStringToBuffer(str, s, len);
- s[len] = '\0';
- }
-#endif
+
+ gjs_string_get_binary_data (context, value, &s, NULL);
g_assert(s != NULL);
strcmp_result = strcmp(s, "This is an exception 42");
free(s);
diff --git a/gjs/jsapi-util-string.c b/gjs/jsapi-util-string.c
index 90b3c70..5a340be 100644
--- a/gjs/jsapi-util-string.c
+++ b/gjs/jsapi-util-string.c
@@ -50,16 +50,11 @@ gjs_try_string_to_utf8 (JSContext *context,
return FALSE;
}
-#ifdef HAVE_JS_GETSTRINGCHARS
- s = JS_GetStringChars(JSVAL_TO_STRING(string_val));
- s_length = JS_GetStringLength(JSVAL_TO_STRING(string_val));
-#else
s = JS_GetStringCharsAndLength(context, JSVAL_TO_STRING(string_val), &s_length);
if (s == NULL) {
JS_EndRequest(context);
return FALSE;
}
-#endif
utf8_string = g_utf16_to_utf8(s,
(glong)s_length,
@@ -259,28 +254,16 @@ char*
gjs_string_get_ascii(JSContext *context,
jsval value)
{
- JSString *str;
+ char *ascii;
if (!JSVAL_IS_STRING(value)) {
gjs_throw(context, "A string was expected, but value was not a string");
return NULL;
}
- str = JSVAL_TO_STRING(value);
+ gjs_string_get_binary_data(context, value, &ascii, NULL);
-#ifdef HAVE_JS_GETSTRINGBYTES
- return g_strdup(JS_GetStringBytes(str));
-#else
- char *ascii;
- size_t len = JS_GetStringEncodingLength(context, str);
- if (len == (size_t)(-1))
- return NULL;
-
- ascii = g_malloc((len + 1) * sizeof(char));
- JS_EncodeStringToBuffer(str, ascii, len);
- ascii[len] = '\0';
return ascii;
-#endif
}
static JSBool
@@ -316,6 +299,8 @@ gjs_string_get_binary_data(JSContext *context,
gsize *len_p)
{
JSString *str;
+ gsize len;
+ char *bytes;
JS_BeginRequest(context);
@@ -333,23 +318,19 @@ gjs_string_get_binary_data(JSContext *context,
str = JSVAL_TO_STRING(value);
-#ifdef HAVE_JS_GETSTRINGBYTES
- const char *js_data = JS_GetStringBytes(str);
-
- /* GetStringLength returns number of 16-bit jschar;
- * we stored binary data as 1 byte per jschar
- */
- *len_p = JS_GetStringLength(str);
- *data_p = g_memdup(js_data, *len_p);
-#else
- *len_p = JS_GetStringEncodingLength(context, str);
- if (*len_p == (gsize)(-1))
+ len = JS_GetStringEncodingLength(context, str);
+ if (len == (gsize)(-1))
return JS_FALSE;
- *data_p = g_malloc((*len_p + 1) * sizeof(char));
- JS_EncodeStringToBuffer(str, *data_p, *len_p);
- (*data_p)[*len_p] = '\0';
-#endif
+ if (data_p) {
+ bytes = g_malloc((len + 1) * sizeof(char));
+ JS_EncodeStringToBuffer(str, bytes, len);
+ bytes[len] = '\0';
+ *data_p = bytes;
+ }
+
+ if (len_p)
+ *len_p = len;
JS_EndRequest(context);
@@ -429,14 +410,10 @@ gjs_string_get_uint16_data(JSContext *context,
goto out;
}
-#ifdef HAVE_JS_GETSTRINGCHARS
- js_data = JS_GetStringChars(JSVAL_TO_STRING(value));
- *len_p = JS_GetStringLength(JSVAL_TO_STRING(value));
-#else
js_data = JS_GetStringCharsAndLength(context, JSVAL_TO_STRING(value), len_p);
if (js_data == NULL)
goto out;
-#endif
+
*data_p = g_memdup(js_data, sizeof(*js_data)*(*len_p));
retval = JS_TRUE;
@@ -462,24 +439,12 @@ gjs_get_string_id (JSContext *context,
char **name_p)
{
jsval id_val;
- JSString *str;
if (!JS_IdToValue(context, id, &id_val))
return JS_FALSE;
if (JSVAL_IS_STRING(id_val)) {
- str = JSVAL_TO_STRING(id_val);
-#ifdef HAVE_JS_GETSTRINGBYTES
- *name_p = g_strdup(JS_GetStringBytes(str));
-#else
- size_t len = JS_GetStringEncodingLength(context, str);
- if (len == (size_t)(-1))
- return JS_FALSE;
-
- *name_p = g_malloc((len + 1) * sizeof(char));
- JS_EncodeStringToBuffer(str, *name_p, len);
- (*name_p)[len] = '\0';
-#endif
+ gjs_string_get_binary_data(context, id_val, name_p, NULL);
return JS_TRUE;
} else {
*name_p = NULL;
diff --git a/gjs/jsapi-util.c b/gjs/jsapi-util.c
index 1dde7e8..c495e20 100644
--- a/gjs/jsapi-util.c
+++ b/gjs/jsapi-util.c
@@ -255,20 +255,9 @@ gboolean
gjs_init_context_standard (JSContext *context)
{
JSObject *global;
-#ifdef HAVE_MOZJS_2
-#ifdef HAVE_JS_NEWCOMPARTMENTANDGLOBALOBJECT
global = JS_NewCompartmentAndGlobalObject(context, &global_class, NULL);
-#else
- global = JS_NewGlobalObject(context, &global_class);
-#endif /* HAVE_JS_NEWCOMPARTMENTANDGLOBALOBJECT */
if (global == NULL)
return FALSE;
-#else
- global = JS_NewObject(context, &global_class, NULL, NULL);
- if (global == NULL)
- return FALSE;
- JS_SetGlobalObject(context, global);
-#endif /* HAVE_MOZJS_2 */
if (!JS_InitStandardClasses(context, global))
return FALSE;
return TRUE;
@@ -784,12 +773,7 @@ gjs_string_readable (JSContext *context,
size_t i, len;
const jschar *uchars;
-#ifdef HAVE_JS_GETSTRINGCHARS
- uchars = JS_GetStringChars(string);
- len = JS_GetStringLength(string);
-#else
uchars = JS_GetStringCharsAndLength(context, string, &len);
-#endif
for (i = 0; i < len; i++) {
jschar c = uchars[i];
@@ -859,9 +843,6 @@ gjs_value_debug_string(JSContext *context,
g_assert(str != NULL);
-#ifdef HAVE_JS_GETSTRINGBYTES
- bytes = g_strdup(JS_GetStringBytes(str));
-#else
size_t len = JS_GetStringEncodingLength(context, str);
if (len != (size_t)(-1)) {
bytes = g_malloc((len + 1) * sizeof(char));
@@ -870,7 +851,6 @@ gjs_value_debug_string(JSContext *context,
} else {
bytes = g_strdup("[invalid string]");
}
-#endif
JS_EndRequest(context);
debugstr = _gjs_g_utf8_make_valid(bytes);
diff --git a/gjs/profiler.c b/gjs/profiler.c
index cd17276..0e29542 100644
--- a/gjs/profiler.c
+++ b/gjs/profiler.c
@@ -134,6 +134,7 @@ gjs_profile_function_key_from_js(JSContext *cx,
{
JSScript *script;
JSFunction *function;
+ JSString *function_name;
/* We're not using the JSScript or JSFunction as the key since the script
* could be unloaded and addresses reused.
@@ -153,17 +154,11 @@ gjs_profile_function_key_from_js(JSContext *cx,
* (or other object with a 'call' method) and would be good to somehow
* figure out the name of the called function.
*/
-#ifdef HAVE_JS_GETFUNCTIONNAME
- key->function_name = g_strdup(function != NULL ? JS_GetFunctionName(function) : "(unknown)");
-#else
- {
- JSString *function_name = JS_GetFunctionId(function);
- if (function_name)
- key->function_name = gjs_string_get_ascii(cx, STRING_TO_JSVAL(function_name));
- else
- key->function_name = g_strdup("(unknown)");
- }
-#endif
+ function_name = JS_GetFunctionId(function);
+ if (function_name)
+ key->function_name = gjs_string_get_ascii(cx, STRING_TO_JSVAL(function_name));
+ else
+ key->function_name = g_strdup("(unknown)");
g_assert(key->filename != NULL);
g_assert(key->function_name != NULL);
diff --git a/gjs/stack.c b/gjs/stack.c
index cd6c249..363366d 100644
--- a/gjs/stack.c
+++ b/gjs/stack.c
@@ -95,11 +95,7 @@ format_frame(JSContext* cx, JSStackFrame* fp,
(void)JS_EnterLocalRootScope(cx);
-#ifdef HAVE_JS_ISSCRIPTFRAME
if (!JS_IsScriptFrame(cx, fp)) {
-#else
- if (JS_IsNativeFrame(cx, fp)) {
-#endif
g_string_append_printf(buf, "%d [native frame]\n", num);
goto out;
}
@@ -114,13 +110,9 @@ format_frame(JSContext* cx, JSStackFrame* fp,
lineno = (guint32) JS_PCToLineNumber(cx, script, pc);
fun = JS_GetFrameFunction(cx, fp);
if (fun) {
-#ifdef HAVE_JS_GETFUNCTIONNAME
- funname_str = g_strdup(JS_GetFunctionName(fun));
-#else
JSString* funname = JS_GetFunctionId(fun);
if (funname)
funname_str = gjs_string_get_ascii(cx, STRING_TO_JSVAL(funname));
-#endif
}
call_obj = JS_GetFrameCallObject(cx, fp);
diff --git a/modules/console.c b/modules/console.c
index 403c1dd..f2772b2 100644
--- a/modules/console.c
+++ b/modules/console.c
@@ -161,11 +161,7 @@ gjs_console_interact(JSContext *context,
{
JSObject *object = JS_THIS_OBJECT(context, vp);
gboolean eof = FALSE;
-#ifdef HAVE_JS_DESTROYSCRIPT
- JSScript *script = NULL;
-#else
JSObject *script = NULL;
-#endif
jsval result;
JSString *str;
GString *buffer = NULL;
@@ -199,14 +195,10 @@ gjs_console_interact(JSContext *context,
g_string_append(buffer, temp_buf);
g_free(temp_buf);
lineno++;
-#ifdef HAVE_JS_DECODEUTF8
- } while (!JS_BufferIsCompilableUnit(context, JS_TRUE, object, buffer->str, buffer->len));
-#else
/* Note in this case, we are trying to parse the buffer as
* ISO-8859-1 which is broken for non-ASCII.
*/
} while (!JS_BufferIsCompilableUnit(context, object, buffer->str, buffer->len));
-#endif
if ((u16_buffer = g_utf8_to_utf16 (buffer->str, buffer->len, NULL, &u16_buffer_len, &error)) == NULL) {
g_printerr ("%s\n", error->message);
@@ -240,10 +232,6 @@ gjs_console_interact(JSContext *context,
}
next:
-#ifdef HAVE_JS_DESTROYSCRIPT
- if (script)
- JS_DestroyScript(context, script);
-#endif
g_string_free(buffer, TRUE);
} while (!eof);
diff --git a/modules/lang.c b/modules/lang.c
index b7a0dca..c9f8c2e 100644
--- a/modules/lang.c
+++ b/modules/lang.c
@@ -41,15 +41,10 @@ gjs_lang_seal(JSContext *cx,
return JS_FALSE;
if (!target)
return JS_TRUE;
-#ifdef HAVE_JS_FREEZEOBJECT
if (deep && (!JS_DeepFreezeObject(cx, target)) )
return JS_FALSE;
if (!deep && (!JS_FreezeObject(cx, target)) )
return JS_FALSE;
-#else
- if (!JS_SealObject(cx, target, deep))
- return JS_FALSE;
-#endif
JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(target));
return JS_TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
