diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2012-06-13 17:57:16 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-06-13 17:57:16 +0000 |
| commit | 0be03dea208077574954c47c6709043e0f5272da (patch) | |
| tree | cfc07a7266f48510b5d2d4dd39c2ea2c1872bea9 /javascript | |
| parent | 4c89c9d5df511852f2743d277cf39611b49ce7f2 (diff) | |
| download | netsurf-0be03dea208077574954c47c6709043e0f5272da.tar.gz netsurf-0be03dea208077574954c47c6709043e0f5272da.tar.bz2 | |
fix include for non javascript builds
svn path=/trunk/netsurf/; revision=13964
Diffstat (limited to 'javascript')
| -rw-r--r-- | javascript/global.c | 7 | ||||
| -rw-r--r-- | javascript/nojs.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/javascript/global.c b/javascript/global.c index 10355a910..c2033d4fc 100644 --- a/javascript/global.c +++ b/javascript/global.c @@ -31,15 +31,14 @@ static JSBool jsalert(JSContext *cx, uintN argc, jsval *vp) return JS_FALSE; -#ifdef SPIDERMONKEY_400 +#if JS_VERSION <= 180 + txt = JS_GetStringBytes(u16_txt); +#else unsigned int length; length = JS_GetStringLength(u16_txt); txt = alloca(sizeof(char)*(length+1)); JS_EncodeStringToBuffer(u16_txt, txt, length); txt[length] = '\0'; - -#else - txt = JS_GetStringBytes(u16_txt); #endif warn_user(txt, NULL); diff --git a/javascript/nojs.c b/javascript/nojs.c index fe1cd191a..20c7dc1fa 100644 --- a/javascript/nojs.c +++ b/javascript/nojs.c @@ -20,7 +20,7 @@ * Dummy implementation of javascript engine functions. */ -#include "desktop/js.h" +#include "javascript/js.h" #include "utils/log.h" void js_initialise(void) |