Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Proper fix because JS_VERSION cannot distinguish between 1.8.0 and 1.8.1

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@800873 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 538cfb0940efaab2729724519b68bee8bdbcfad4 1 parent b060d7e
@davisp davisp authored
Showing with 22 additions and 11 deletions.
  1. +10 −0 configure.ac
  2. +12 −11 src/couchdb/couch_js.c
View
10 configure.ac
@@ -103,6 +103,16 @@ AC_CHECK_HEADER([jsapi.h], [], [
Are the Mozilla SpiderMonkey headers installed?])
])])
+AC_LANG_PUSH(C)
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[]],
+ [[JS_SetOperationCallback(0, 0);]]
+ )],
+ AC_DEFINE([USE_JS_SETOPCB], [], [Use new JS_SetOperationCallback])
+)
+AC_LANG_POP(C)
+
AC_CHECK_ICU([3])
ICU_LOCAL_CFLAGS=`$ICU_CONFIG --cppflags-searchpath`
View
23 src/couchdb/couch_js.c
@@ -19,6 +19,7 @@ specific language governing permissions and limitations under the License.
#include "curlhelper.h"
#include <jsapi.h>
#include <curl/curl.h>
+#include "config.h"
#ifndef CURLOPT_COPYPOSTFIELDS
#define CURLOPT_COPYPOSTFIELDS 10165
@@ -214,7 +215,7 @@ EvalInContext(JSContext *context, JSObject *obj, uintN argc, jsval *argv,
return JS_FALSE;
}
-#if JS_VERSION > 170
+#ifdef USE_JS_SETOPCB
JS_SetContextThread(sub_context);
JS_BeginRequest(sub_context);
#endif
@@ -240,7 +241,7 @@ EvalInContext(JSContext *context, JSObject *obj, uintN argc, jsval *argv,
}
out:
-#if JS_VERSION > 170
+#ifdef USE_JS_SETOPCB
JS_EndRequest(sub_context);
JS_ClearContextThread(sub_context);
#endif
@@ -405,9 +406,10 @@ ExecuteScript(JSContext *context, JSObject *obj, const char *filename) {
static uint32 gBranchCount = 0;
-#if JS_VERSION <= 170
+#ifdef USE_JS_SETOPCB
static JSBool
-BranchCallback(JSContext *context, JSScript *script) {
+OperationCallback(JSContext *context)
+{
if ((++gBranchCount & 0x3fff) == 1) {
JS_MaybeGC(context);
}
@@ -415,8 +417,7 @@ BranchCallback(JSContext *context, JSScript *script) {
}
#else
static JSBool
-OperationCallback(JSContext *context)
-{
+BranchCallback(JSContext *context, JSScript *script) {
if ((++gBranchCount & 0x3fff) == 1) {
JS_MaybeGC(context);
}
@@ -1234,13 +1235,13 @@ main(int argc, const char * argv[]) {
return 1;
/* FIXME: https://bugzilla.mozilla.org/show_bug.cgi?id=477187 */
JS_SetErrorReporter(context, PrintError);
-#if JS_VERSION <= 170
- JS_SetBranchCallback(context, BranchCallback);
- JS_ToggleOptions(context, JSOPTION_NATIVE_BRANCH_CALLBACK);
-#else
+#ifdef USE_JS_SETOPCB
JS_SetContextThread(context);
JS_BeginRequest(context);
JS_SetOperationCallback(context, OperationCallback);
+#else
+ JS_SetBranchCallback(context, BranchCallback);
+ JS_ToggleOptions(context, JSOPTION_NATIVE_BRANCH_CALLBACK);
#endif
JS_ToggleOptions(context, JSOPTION_XML);
@@ -1272,7 +1273,7 @@ main(int argc, const char * argv[]) {
ExecuteScript(context, global, argv[1]);
-#if JS_VERSION > 170
+#ifdef USE_JS_SETOPCB
JS_EndRequest(context);
JS_ClearContextThread(context);
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.