summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win/winMain.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ecedca4..f734913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-13 Don Porter <dgp@users.sourceforge.net>
+
+ * win/winMain.c (WishPanic): Replaced TCL_VARARGS* macros with
+ direct use of stdarg.h conventions.
+
2005-09-11 Daniel Steffen <das@users.sourceforge.net>
* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): check if
diff --git a/win/winMain.c b/win/winMain.c
index 7a05b5e..4f89b2c 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: winMain.c,v 1.21 2004/02/02 08:12:58 davygrvy Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.22 2005/09/13 21:25:21 dgp Exp $
*/
#include <tk.h>
@@ -30,7 +30,7 @@
* Forward declarations for procedures defined later in this file:
*/
-static void WishPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *,format));
+static void WishPanic _ANSI_ARGS_((CONST char *format, ...));
#ifdef TK_TEST
extern int Tktest_Init(Tcl_Interp *interp);
#endif /* TK_TEST */
@@ -226,13 +226,12 @@ error:
*/
void
-WishPanic TCL_VARARGS_DEF(CONST char *,arg1)
+WishPanic(CONST char *format, ...)
{
va_list argList;
char buf[1024];
- CONST char *format;
- format = TCL_VARARGS_START(CONST char *,arg1,argList);
+ va_start(argList, format);
vsprintf(buf, format, argList);
MessageBeep(MB_ICONEXCLAMATION);