Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-20 17:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 23320. Per Franz.Sirl-kernel@lauterbach.com's suggestion, fix passing of va_list for platforms that typedef to an array. r=brendan

Browse Source
This commit is contained in:
waterson%netscape.com 2000-01-08 00:32:25 +00:00
parent dcbf3266bd
commit 04af7c0f43
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jsapi.c
View File

@ -73,6 +73,12 @@
#include "jsfile.h"
#endif
#ifdef HAVE_VA_LIST_AS_ARRAY
#define JS_ADDRESSOF_VA_LIST(ap) (ap)
#else
#define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
#endif
#if defined(JS_PARANOID_REQUEST) && defined(JS_THREADSAFE)
#define CHECK_REQUEST(cx) JS_ASSERT(cx->requestDepth)
#else
@ -239,7 +245,7 @@ JS_ConvertArgumentsVA(JSContext *cx, uintN argc, jsval *argv,
break;
default:
format--;
if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp, &ap))
if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp, JS_ADDRESSOF_VA_LIST(ap)))
return JS_FALSE;
/* NB: the formatter already updated sp, so we continue here. */
continue;
@ -339,7 +345,7 @@ JS_PushArgumentsVA(JSContext *cx, void **markp, const char *format, va_list ap)
break;
default:
format--;
if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp, &ap))
if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp, JS_ADDRESSOF_VA_LIST(ap)))
goto bad;
/* NB: the formatter already updated sp, so we continue here. */
continue;