summaryrefslogtreecommitdiff
path: root/javascript/jsapi.h
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2013-05-19 23:48:55 +0100
committerVincent Sanders <vince@netsurf-browser.org>2013-05-22 19:12:26 +0100
commitce0fe06349753b2ad1cfa7b0b1cfcaa77c4e47ab (patch)
tree695b26567b3277cc799ee5d925cf9a46454fb806 /javascript/jsapi.h
parent447c0fc2715ef690f47bda0da60ee3c3d750950d (diff)
downloadnetsurf-ce0fe06349753b2ad1cfa7b0b1cfcaa77c4e47ab.tar.gz
netsurf-ce0fe06349753b2ad1cfa7b0b1cfcaa77c4e47ab.tar.bz2
create javascript heartbeat and hook a script timeout to it
Diffstat (limited to 'javascript/jsapi.h')
-rw-r--r--javascript/jsapi.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/javascript/jsapi.h b/javascript/jsapi.h
index e38188ab4..8f9affd02 100644
--- a/javascript/jsapi.h
+++ b/javascript/jsapi.h
@@ -23,12 +23,21 @@
#ifndef _NETSURF_JAVASCRIPT_JSAPI_H_
#define _NETSURF_JAVASCRIPT_JSAPI_H_
+/* include teh correct header */
#ifdef WITH_MOZJS
#include "js/jsapi.h"
#else
#include "mozjs/jsapi.h"
#endif
+/* logging macros */
+#define JSLOG(args...) LOG((args))
+#ifdef ENABLE_VERBOSE_JS_DEBUG
+#define JSDBG(args...) LOG((args))
+#else
+#define JSDBG(args...)
+#endif
+
#if JS_VERSION < 180
/************************** Spidermonkey 1.7.0 **************************/
@@ -375,11 +384,6 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
#endif
-#define JSLOG(args...) LOG((args))
-#ifdef ENABLE_VERBOSE_JS_DEBUG
-#define JSDBG(args...) LOG((args))
-#else
-#define JSDBG(args...)
-#endif
+/************************** **************************/
#endif