diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-11-03 18:28:48 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-11-03 18:28:48 +0000 |
| commit | 6648ba39ade5ed8c1a5ceccab82eed567478c950 (patch) | |
| tree | 6656dc55f3af76a918185e7a9625257a27abdac6 /javascript | |
| parent | e7431898abbcb4cc49cfbe35fe457df78afa5f0a (diff) | |
| parent | 85c973f98648465ab065317f8e7db6153d093984 (diff) | |
| download | netsurf-6648ba39ade5ed8c1a5ceccab82eed567478c950.tar.gz netsurf-6648ba39ade5ed8c1a5ceccab82eed567478c950.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'javascript')
| -rw-r--r-- | javascript/jsapi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/javascript/jsapi.h b/javascript/jsapi.h index e7c10c139..61baa5ce1 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -94,6 +94,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, outchar = JS_GetStringBytes(injsstring); \ outlen = strlen(outchar) +/* string type cast */ +#define JSAPI_STRING_TO_JSVAL(str) ((str == NULL)?JSVAL_NULL:STRING_TO_JSVAL(str)) #else /* #if JS_VERSION <= 180 */ @@ -152,6 +154,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, JS_EncodeStringToBuffer(injsstring, outchar, outlen); \ outchar[outlen] = '\0' +/* string type cast */ +#define JSAPI_STRING_TO_JSVAL(str) ((str == NULL)?JSVAL_NULL:STRING_TO_JSVAL(str)) #endif |