diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2012-11-08 00:34:00 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2012-11-08 00:34:00 +0000 |
| commit | 6893fcf829e928881c1bd05a541b33443078ea9c (patch) | |
| tree | 90952f1db52ec8f1f5eb791709b8b5ad39012e62 | |
| parent | 457f6ee05e7349afd21062f1c417534541cc5e96 (diff) | |
| download | nsgenbind-6893fcf829e928881c1bd05a541b33443078ea9c.tar.gz nsgenbind-6893fcf829e928881c1bd05a541b33443078ea9c.tar.bz2 | |
change to using compat macros for garbage colelction marking
| -rw-r--r-- | src/jsapi-libdom.c | 14 | ||||
| -rwxr-xr-x | test/testrunner.sh | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/jsapi-libdom.c b/src/jsapi-libdom.c index 2f5e098..41491c1 100644 --- a/src/jsapi-libdom.c +++ b/src/jsapi-libdom.c @@ -207,14 +207,14 @@ output_api_operations(struct binding *binding) if (binding->mark != NULL) { /* generate trace/mark entry */ fprintf(binding->outfile, - "static JSBool jsclass_mark(JSTracer *trc, JSObject *obj)\n" + "static JSAPI_MARKOP(jsclass_mark)\n" "{\n"); if(binding->has_private) { fprintf(binding->outfile, "\tstruct jsclass_private *private;\n" "\n" - "\tprivate = JS_GetInstancePrivate(trc->context, obj, &JSClass_%s, NULL);\n", + "\tprivate = JS_GetInstancePrivate(JSAPI_MARKCX, obj, &JSClass_%s, NULL);\n", binding->interface); } @@ -412,7 +412,7 @@ output_jsclass(struct binding *binding) } if (binding->mark != NULL) { - fprintf(binding->outfile, " | JSCLASS_MARK_IS_TRACE"); + fprintf(binding->outfile, " | JSAPI_JSCLASS_MARK_IS_TRACE"); } if (binding->has_private) { @@ -447,13 +447,13 @@ output_jsclass(struct binding *binding) "\t0,\t/* reserved */\n" "\tNULL,\t/* checkAccess */\n" "\tNULL,\t/* call */\n" - "\tNULL,\t/* construct */" - "\tNULL,\t/* xdr Object */" - "\tNULL,\t/* hasInstance */"); + "\tNULL,\t/* construct */\n" + "\tNULL,\t/* xdr Object */\n" + "\tNULL,\t/* hasInstance */\n"); /* trace/mark */ if (binding->mark != NULL) { - fprintf(binding->outfile, "\t(JSMarkOp)jsclass_mark,\n"); + fprintf(binding->outfile, "\tJSAPI_JSCLASS_MARKOP(jsclass_mark),\n"); } else { fprintf(binding->outfile, "\tNULL, /* trace/mark */\n"); } diff --git a/test/testrunner.sh b/test/testrunner.sh index c379fca..3c8a0ae 100755 --- a/test/testrunner.sh +++ b/test/testrunner.sh @@ -28,9 +28,9 @@ for TEST in ${BINDINGTESTS};do echo -n " TEST: ${TESTNAME}......" outline - echo ${GENJSBIND} -d -v -I ${IDLDIR} -o ${BUILDDIR}/test_${TESTNAME}.c ${TEST} >>${LOGFILE} 2>&1 + echo ${GENJSBIND} -D -v -I ${IDLDIR} -o ${BUILDDIR}/test_${TESTNAME}.c ${TEST} >>${LOGFILE} 2>&1 - ${GENJSBIND} -d -v -I ${IDLDIR} -o ${BUILDDIR}/test_${TESTNAME}.c ${TEST} >>${LOGFILE} 2>&1 + ${GENJSBIND} -D -v -I ${IDLDIR} -o ${BUILDDIR}/test_${TESTNAME}.c ${TEST} >>${LOGFILE} 2>&1 if [ $? -eq 0 ]; then echo "PASS" |