3 files changed, 9 insertions, 6 deletions
diff --git a/mac/tclMacAppInit.c b/mac/tclMacAppInit.c
index 7eaa6c7..1e83125 100644
--- a/mac/tclMacAppInit.c
+++ b/mac/tclMacAppInit.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: tclMacAppInit.c,v 1.6 2001/06/08 20:06:11 dgp Exp $
+ * RCS: @(#) $Id: tclMacAppInit.c,v 1.7 2001/06/14 00:48:51 dgp Exp $
  */
 
 #include "tcl.h"
@@ -64,7 +64,6 @@ main(
 {
     char *newArgv[2];
     
-    TclMacSetPanic();
     if (MacintoshInit()  != TCL_OK) {
 	Tcl_Exit(1);
     }
@@ -206,6 +205,8 @@ MacintoshInit()
 		
 #endif
 
+    TclMacSetPanic();
+
     Tcl_MacSetEventProc((Tcl_MacConvertEventPtr) SIOUXHandleOneEvent);
     
     /* No problems with initialization */
diff --git a/mac/tclMacBOAAppInit.c b/mac/tclMacBOAAppInit.c
index afdfbd5..0f7687b 100644
--- a/mac/tclMacBOAAppInit.c
+++ b/mac/tclMacBOAAppInit.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: tclMacBOAAppInit.c,v 1.4 2001/06/08 20:06:11 dgp Exp $
+ * RCS: @(#) $Id: tclMacBOAAppInit.c,v 1.5 2001/06/14 00:48:51 dgp Exp $
  */
 
 #include "tcl.h"
@@ -75,7 +75,6 @@ main(
 {
     char *newArgv[3];
     
-    TclMacSetPanic();
     if (MacintoshInit()  != TCL_OK) {
 	Tcl_Exit(1);
     }
diff --git a/mac/tclMacPanic.c b/mac/tclMacPanic.c
index 06ae73e..896a633 100644
--- a/mac/tclMacPanic.c
+++ b/mac/tclMacPanic.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclMacPanic.c,v 1.3 2001/06/08 20:06:11 dgp Exp $
+ * RCS: @(#) $Id: tclMacPanic.c,v 1.4 2001/06/14 00:48:51 dgp Exp $
  */
 
 
@@ -27,6 +27,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "tclInt.h"
+#include "tclMacInt.h"
+
 /*
  * constants for panic dialog
  */
@@ -59,7 +62,7 @@ static void		MacPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *, format));
 
         /* VARARGS ARGSUSED */
 static void
-MacPanic TCL_VARARGS_DEF(CONST char *, arg1)
+MacPanic TCL_VARARGS_DEF(CONST char *, format)
 {
     va_list varg;
     char msg[256];