Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move JSArgumentFormatter typedef from jspubtd.h to jsapi.h to cope with bad

Browse Source 
includers who grab jspubtd.h first, then stdarg.h, then jsapi.h.
This commit is contained in:
brendan%netscape.com 1999-06-28 03:52:16 +00:00
parent e3df4f3ab2
commit 0476eb43d9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsapi.h
View File

@ -195,7 +195,7 @@ JS_PopArguments(JSContext *cx, void *mark);
#ifdef va_start
/*
* Add and remove a format string handler for JS_{Convert,Push}Arguments{,VA}.
* The handler function has this signature (see jspubtd.h):
* The handler function has this signature:
*
* JSBool MyArgumentFormatter(JSContext *cx, const char *format,
* JSBool fromJS, jsval **vpp, va_list *app);
@ -232,6 +232,16 @@ JS_PopArguments(JSContext *cx, void *mark);
* is typically a string constant. If format is in dynamic storage, it is up
* to the caller to keep the string alive until Remove is called.
*/
/* XXX typedef'd here rather than in jspubtd.h #ifdef va_start, to avoid bad
* XXX includers who grab jspubtd.h, then <stdarg.h>, then jsapi.h and unhide
* XXX the typedef uses below in JS_AddArgumentFormatter without exposing the
* XXX definition in jspubtd.h, which is of course include-idempotent.
*/
typedef JSBool
(* CRT_CALL JSArgumentFormatter)(JSContext *cx, const char *format,
JSBool fromJS, jsval **vpp, va_list *app);
JS_PUBLIC_API(JSBool)
JS_AddArgumentFormatter(JSContext *cx, const char *format,
JSArgumentFormatter formatter);

6
js/src/jspubtd.h
View File

@ -238,12 +238,6 @@ typedef const JSErrorFormatString *
(* CRT_CALL JSErrorCallback)(void *userRef, const char *locale,
const uintN errorNumber);
#ifdef va_start
typedef JSBool
(* CRT_CALL JSArgumentFormatter)(JSContext *cx, const char *format,
JSBool fromJS, jsval **vpp, va_list *app);
#endif
JS_END_EXTERN_C
#endif /* jspubtd_h___ */