Tcl Source Code

Artifact [49863657eb]
Login

Artifact 49863657ebfc15dd6b95f919d9b9955bbd54581c:

Attachment "mac.patch" to ticket [415648ffff] added by dgp 2001-06-14 07:41:56.
? mac.patch
? tip17.patch
? 219210.diff.5
? 403531.patch
? doc/FileSystem.3
Index: mac/tclMacAppInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/tclMacAppInit.c,v
retrieving revision 1.6
diff -u -r1.6 tclMacAppInit.c
--- mac/tclMacAppInit.c	2001/06/08 20:06:11	1.6
+++ mac/tclMacAppInit.c	2001/06/14 00:38:54
@@ -64,7 +64,6 @@
 {
     char *newArgv[2];
     
-    TclMacSetPanic();
     if (MacintoshInit()  != TCL_OK) {
 	Tcl_Exit(1);
     }
@@ -205,6 +204,8 @@
     InitCursor();
 		
 #endif
+
+    TclMacSetPanic();
 
     Tcl_MacSetEventProc((Tcl_MacConvertEventPtr) SIOUXHandleOneEvent);
     
Index: mac/tclMacBOAAppInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/tclMacBOAAppInit.c,v
retrieving revision 1.4
diff -u -r1.4 tclMacBOAAppInit.c
--- mac/tclMacBOAAppInit.c	2001/06/08 20:06:11	1.4
+++ mac/tclMacBOAAppInit.c	2001/06/14 00:38:54
@@ -75,7 +75,6 @@
 {
     char *newArgv[3];
     
-    TclMacSetPanic();
     if (MacintoshInit()  != TCL_OK) {
 	Tcl_Exit(1);
     }
Index: mac/tclMacPanic.c
===================================================================
RCS file: /cvsroot/tcl/tcl/mac/tclMacPanic.c,v
retrieving revision 1.3
diff -u -r1.3 tclMacPanic.c
--- mac/tclMacPanic.c	2001/06/08 20:06:11	1.3
+++ mac/tclMacPanic.c	2001/06/14 00:38:54
@@ -27,6 +27,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "tclInt.h"
+#include "tclMacInt.h"
+
 /*
  * constants for panic dialog
  */
@@ -59,7 +62,7 @@
 
         /* VARARGS ARGSUSED */
 static void
-MacPanic TCL_VARARGS_DEF(CONST char *, arg1)
+MacPanic TCL_VARARGS_DEF(CONST char *, format)
 {
     va_list varg;
     char msg[256];