diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2012-11-03 17:37:59 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-11-03 17:37:59 +0000 |
commit | 85c973f98648465ab065317f8e7db6153d093984 (patch) | |
tree | a38e78de2664042c56df277b91a4b7accdd4bdf7 /javascript/jsapi.h | |
parent | e0f17a8d350c41f5dd304b7968a60bfec84c5b06 (diff) | |
download | netsurf-85c973f98648465ab065317f8e7db6153d093984.tar.gz netsurf-85c973f98648465ab065317f8e7db6153d093984.tar.bz2 |
add jsstring to jsval conversion macro that copes with null jsstrings
Diffstat (limited to 'javascript/jsapi.h')
-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 |