rename panic() to panic1() because of conflict on Darwin with /usr/include/mach/mach...

diff --git a/cmd/lefty/exec.c b/cmd/lefty/exec.c
index 5f2f66e8c5e5e20dbd3eff813bade8209282e2b7..f1ee279bdd080406e72f0b69c4c787e5b5186cac 100644 (file)
--- a/cmd/lefty/exec.c
+++ b/cmd/lefty/exec.c
@@ -185,7 +185,7 @@ Tobj Eunit (Tobj co) {
         return NULL;
 
     if (Tgettype (co) != T_CODE)
-        panic (POS, "Eunit", "argument type is not T_CODE");
+        panic1 (POS, "Eunit", "argument type is not T_CODE");
 
     m = Mpushmark (co);
     PUSHJMP (oeljbufp, eljbufp, eljbuf);
@@ -426,7 +426,7 @@ tailrec:
         /* NOT REACHED */
         break;
     default:
-        panic (POS, "eeval", "unknown program token type %d", ctype);
+        panic1 (POS, "eeval", "unknown program token type %d", ctype);
     }
     return v1o;
 }
@@ -490,7 +490,7 @@ static Tobj efcall (Tobj co, int ci) {
         sinfop[ownsinfoi].fco = fdo;
         sinfop[ownsinfoi].fci = bi;
         if (fid < 0 || fid >= Ifuncn)
-            panic (POS, "efcall", "no such internal function: %d", fid);
+            panic1 (POS, "efcall", "no such internal function: %d", fid);
         rtno = Ttrue;
         if ((*Ifuncs[fid].func) (i, &lvarp[flvari]) == L_FAILURE) {
             rtno = NULL;
@@ -892,7 +892,7 @@ static int orderop (Tobj v1o, int op, Tobj v2o) {
     case C_GT: return (r >  0) ? TRUE : FALSE;
     case C_GE: return (r >= 0) ? TRUE : FALSE;
     }
-    panic (POS, "orderop", "bad op code");
+    panic1 (POS, "orderop", "bad op code");
     return FALSE; /* NOT REACHED */
 }
 

diff --git a/cmd/lefty/g.c b/cmd/lefty/g.c
index 04bdda4953169822e955efefe72246578a7e46e8..0ef5938fece77fd50a5fb6686293301d48837254 100644 (file)
--- a/cmd/lefty/g.c
+++ b/cmd/lefty/g.c
@@ -790,7 +790,7 @@ found:
     new->udata = 0;
     /* HACK: should do a switch on type, but ... */
     if (!(new->u.c = (Gcw_t *) malloc (wsizes[type])))
-        panic (POS, "newwidget", "cannot allocate data");
+        panic1 (POS, "newwidget", "cannot allocate data");
     return new;
 }
 

diff --git a/cmd/lefty/gfxview.c b/cmd/lefty/gfxview.c
index cf72efa037f5ee98245f49097cf4829aa49092a1..0df2d190a391df108b5bab3cf781cc5941e8a04c 100644 (file)
--- a/cmd/lefty/gfxview.c
+++ b/cmd/lefty/gfxview.c
@@ -1594,7 +1594,7 @@ static void rectinsert (int ni, Tobj ko, Grect_t r) {
             return;
         }
     if (!(crp = malloc (sizeof (gfxrect_t))))
-        panic (POS, "rectinsert", "rect malloc failed");
+        panic1 (POS, "rectinsert", "rect malloc failed");
 
     crp->ko = ko;
     crp->r.o.x = min (r.o.x, r.c.x);
@@ -1619,7 +1619,7 @@ static void rectmerge (int ni, Tobj ko, Grect_t r) {
             return;
         }
     if (!(crp = malloc (sizeof (gfxrect_t))))
-        panic (POS, "rectmerge", "rect malloc failed");
+        panic1 (POS, "rectmerge", "rect malloc failed");
 
     crp->ko = ko;
     crp->r.o.x = min (r.o.x, r.c.x);
@@ -1693,7 +1693,7 @@ static void menuinsert (int ni, Tobj ko, long time, int mi) {
             return;
         }
     if (!(cmp = malloc (sizeof (gfxmenu_t))))
-        panic (POS, "menuinsert", "menu malloc failed");
+        panic1 (POS, "menuinsert", "menu malloc failed");
 
     cmp->ko = ko;
     cmp->time = time;

diff --git a/cmd/lefty/internal.c b/cmd/lefty/internal.c
index e46e66df67d9c47295f054ba9e37aae7fef86169..ad33951aba6187a108fce1f2d6286537817e83d6 100644 (file)
--- a/cmd/lefty/internal.c
+++ b/cmd/lefty/internal.c
@@ -202,7 +202,7 @@ void Iinit (void) {
     int i;
 
     if (!(bufp = malloc (BUFINCR * BUFSIZE)))
-        panic (POS, "Iinit", "buf malloc failed");
+        panic1 (POS, "Iinit", "buf malloc failed");
     bufn = BUFINCR;
     for (i = 0; Ifuncs[i].name; i++)
         Efunction (Pfunction (Ifuncs[i].name, i), Ifuncs[i].name);
@@ -845,6 +845,6 @@ static void growbufp (int newsize) {
     if (!(bufp = realloc (
         bufp, ((newsize + BUFINCR - 1) / BUFINCR) * BUFINCR * BUFSIZE
     )))
-        panic (POS, "growbufp", "buf realloc failed");
+        panic1 (POS, "growbufp", "buf realloc failed");
     bufn = ((newsize + BUFINCR - 1) / BUFINCR) * BUFINCR;
 }