diff options
author | Christopher Faylor <me@cgf.cx> | 2000-08-02 03:42:31 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2000-08-02 03:42:31 +0000 |
commit | a5a965ff62d95b01858f24d8e89c1dc39bbfb298 (patch) | |
tree | 97b94b0a33ffbefa30ef1073251dcdf0af9876d4 /winsup/cygwin/winsup.h | |
parent | 749d9bcd4b38c921930a9ce51bea2a8df0edf940 (diff) | |
download | cygnal-a5a965ff62d95b01858f24d8e89c1dc39bbfb298.tar.gz cygnal-a5a965ff62d95b01858f24d8e89c1dc39bbfb298.tar.bz2 cygnal-a5a965ff62d95b01858f24d8e89c1dc39bbfb298.zip |
* 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.
Diffstat (limited to 'winsup/cygwin/winsup.h')
-rw-r--r-- | winsup/cygwin/winsup.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index 330c38ce2..4b61c4bbf 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -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); |