summaryrefslogtreecommitdiff
path: root/javascript
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2012-06-27 23:17:18 +0000
committerVincent Sanders <vince@netsurf-browser.org>2012-06-27 23:17:18 +0000
commit804bec4f99f2880d7cc4a99379c3cca5b1c1d1d4 (patch)
treece1faeb59860ae2f3535da557a5f472b95885c74 /javascript
parentcfd26609bd15e5e4fef8c72d0abc6c929afd155b (diff)
downloadnetsurf-804bec4f99f2880d7cc4a99379c3cca5b1c1d1d4.tar.gz
netsurf-804bec4f99f2880d7cc4a99379c3cca5b1c1d1d4.tar.bz2
make non js builds compile
make js support compile with older debian/ubuntu packaging svn path=/trunk/netsurf/; revision=13990
Diffstat (limited to 'javascript')
-rw-r--r--javascript/jsapi.c3
-rw-r--r--javascript/jsapi.h6
-rw-r--r--javascript/jsapi/console.c5
-rw-r--r--javascript/jsapi/document.c4
-rw-r--r--javascript/jsapi/window.c3
-rw-r--r--javascript/none.c2
6 files changed, 12 insertions, 11 deletions
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 <http://www.gnu.org/licenses/>.
*/
-#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 <http://www.gnu.org/licenses/>.
*/
-#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 <http://www.gnu.org/licenses/>.
*/
-#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 <http://www.gnu.org/licenses/>.
*/
-#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;
}