* strace.h: Add kludgy workarounds to avoid using deprecated methods for
variable argument macros when possible. * sigproc.cc: Throughout, use sigproc_printf rather than sip_printf. * strace.cc (strace::prntf): Remove 'active' check, since callers are supposed to ensure this. (__system_printf): Remove. Subsumed by strace::prntf. * winsup.h: Define "NEW_MACRO_VARARGS" to indicate when to use new macro varargs capability.
This commit is contained in:
@@ -23,6 +23,10 @@ details. */
|
||||
# define memset __builtin_memset
|
||||
#endif
|
||||
|
||||
#if !defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199900L
|
||||
#define NEW_MACRO_VARARGS
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/strace.h>
|
||||
#include <sys/resource.h>
|
||||
@@ -279,8 +283,11 @@ extern unsigned int signal_shift_subtract;
|
||||
#define MARK() mark (__FILE__,__LINE__)
|
||||
#endif
|
||||
|
||||
#define api_fatal(fmt, args...) \
|
||||
__api_fatal ("%P: *** " fmt,##args)
|
||||
#ifdef NEW_MACRO_VARARGS
|
||||
# define api_fatal(...) __api_fatal ("%P: *** " __VA_ARGS__)
|
||||
#else
|
||||
# define api_fatal(fmt, args...) __api_fatal ("%P: *** " fmt,## args)
|
||||
#endif
|
||||
|
||||
#undef issep
|
||||
#define issep(ch) (strchr (" \t\n\r", (ch)) != NULL)
|
||||
@@ -325,8 +332,6 @@ void events_terminate (void);
|
||||
|
||||
void __stdcall close_all_files (void);
|
||||
|
||||
extern class strace strace;
|
||||
|
||||
/* Invisible window initialization/termination. */
|
||||
HWND __stdcall gethwnd (void);
|
||||
void __stdcall window_terminate (void);
|
||||
|
Reference in New Issue
Block a user