From 804bec4f99f2880d7cc4a99379c3cca5b1c1d1d4 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 27 Jun 2012 23:17:18 +0000 Subject: make non js builds compile make js support compile with older debian/ubuntu packaging svn path=/trunk/netsurf/; revision=13990 --- javascript/jsapi.c | 3 +-- javascript/jsapi.h | 6 ++++++ javascript/jsapi/console.c | 5 ++--- javascript/jsapi/document.c | 4 +--- javascript/jsapi/window.c | 3 +-- javascript/none.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) (limited to 'javascript') diff --git a/javascript/jsapi.c b/javascript/jsapi.c index da979c458..d1372442c 100644 --- a/javascript/jsapi.c +++ b/javascript/jsapi.c @@ -16,11 +16,10 @@ * along with this program. If not, see . */ -#include "mozjs/jsapi.h" +#include "javascript/jsapi.h" #include "content/content.h" #include "javascript/content.h" -#include "javascript/jsapi.h" #include "javascript/js.h" #include "utils/log.h" diff --git a/javascript/jsapi.h b/javascript/jsapi.h index 61dc82c81..71abb8c20 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -23,6 +23,12 @@ #ifndef _NETSURF_JAVASCRIPT_JSAPI_H_ #define _NETSURF_JAVASCRIPT_JSAPI_H_ +#ifdef WITH_MOZJS +#include "js/jsapi.h" +#else +#include "mozjs/jsapi.h" +#endif + #if JS_VERSION <= 180 inline JSObject * JS_NewCompartmentAndGlobalObject(JSContext *cx, diff --git a/javascript/jsapi/console.c b/javascript/jsapi/console.c index 8621d810c..2d971e44d 100644 --- a/javascript/jsapi/console.c +++ b/javascript/jsapi/console.c @@ -16,10 +16,9 @@ * along with this program. If not, see . */ -#include "mozjs/jsapi.h" - -#include "content/content.h" #include "javascript/jsapi.h" + +//#include "content/content.h" #include "utils/log.h" static JSBool jsdebug(JSContext *cx, uintN argc, jsval *vp) diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c index fe13af13e..c73dac721 100644 --- a/javascript/jsapi/document.c +++ b/javascript/jsapi/document.c @@ -16,10 +16,8 @@ * along with this program. If not, see . */ -#include "mozjs/jsapi.h" - -#include "content/content.h" #include "javascript/jsapi.h" + #include "utils/log.h" static JSFunctionSpec jsfunctions_document[] = { diff --git a/javascript/jsapi/window.c b/javascript/jsapi/window.c index d4941d70f..11a59b5ff 100644 --- a/javascript/jsapi/window.c +++ b/javascript/jsapi/window.c @@ -16,10 +16,9 @@ * along with this program. If not, see . */ -#include "mozjs/jsapi.h" +#include "javascript/jsapi.h" #include "content/content.h" -#include "javascript/jsapi.h" #include "utils/log.h" /* IDL diff --git a/javascript/none.c b/javascript/none.c index ec0ccc0f8..66ee03d85 100644 --- a/javascript/none.c +++ b/javascript/none.c @@ -42,7 +42,7 @@ void js_destroycontext(jscontext *ctx) { } -jsobject *js_newcompartment(jscontext *ctx, struct content* c) +jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv) { return NULL; } -- cgit v1.2.3