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

diff --git a/cmd/lefty/ws/mswin32/garray.c b/cmd/lefty/ws/mswin32/garray.c
index 0abcec71f2b760265ad9bc7c1e7011bbd5a6e2b3..99b02f93743c03bc29398a0e43c5a67e6d67a02f 100644 (file)
--- a/cmd/lefty/ws/mswin32/garray.c
+++ b/cmd/lefty/ws/mswin32/garray.c
@@ -243,7 +243,7 @@ void Gawdefcoordscb (int wi, Gawdata_t *dp) {
 void Gawinitialize (Gwidget_t *widget, int mode) {
     WAU->data.type = mode;
     if (!(WAU->data.carray = Marrayalloc ((long) AWCARRAYINCR * AWCARRAYSIZE)))
-        panic (POS, "Gawinitialize", "cannot allocate carray");
+        panic1 (POS, "Gawinitialize", "cannot allocate carray");
     WAU->data.cn = AWCARRAYINCR;
     WAU->data.cj = 0;
     WAU->data.batchmode = FALSE;

diff --git a/cmd/lefty/ws/mswin32/gcommon.c b/cmd/lefty/ws/mswin32/gcommon.c
index 929bcb6ca6d56b7b1411c832f03378752828a2d9..30b924f5606c3c01476b48e05c048cfc9ff34a88 100644 (file)
--- a/cmd/lefty/ws/mswin32/gcommon.c
+++ b/cmd/lefty/ws/mswin32/gcommon.c
@@ -71,7 +71,7 @@ int Ginitgraphics (void) {
         wc.lpszMenuName = 0;
         wc.lpszClassName = "LeftyClass";
         if (!(rtn = RegisterClass (&wc)))
-            panic (POS, "GXinit", "register class rtn = %d", (int) rtn);
+            panic1 (POS, "GXinit", "register class rtn = %d", (int) rtn);
 
         wc.style = NULL;
         wc.lpfnWndProc = ArrayWndProc;
@@ -84,7 +84,7 @@ int Ginitgraphics (void) {
         wc.lpszMenuName = 0;
         wc.lpszClassName = "ArrayClass";
         if (!(rtn = RegisterClass (&wc)))
-            panic (POS, "GXinit", "register class rtn = %d", (int) rtn);
+            panic1 (POS, "GXinit", "register class rtn = %d", (int) rtn);
 
         wc.style = CS_OWNDC;
         wc.lpfnWndProc = CanvasWndProc;
@@ -97,7 +97,7 @@ int Ginitgraphics (void) {
         wc.lpszMenuName = 0;
         wc.lpszClassName = "CanvasClass";
         if (!(rtn = RegisterClass (&wc)))
-            panic (POS, "GXinit", "register class rtn = %d", (int) rtn);
+            panic1 (POS, "GXinit", "register class rtn = %d", (int) rtn);
 
         wc.style = NULL;
         wc.lpfnWndProc = ScrollWndProc;
@@ -110,7 +110,7 @@ int Ginitgraphics (void) {
         wc.lpszMenuName = 0;
         wc.lpszClassName = "ScrollClass";
         if (!(rtn = RegisterClass (&wc)))
-            panic (POS, "GXinit", "register class rtn = %d", (int) rtn);
+            panic1 (POS, "GXinit", "register class rtn = %d", (int) rtn);
 
         wc.style = NULL;
         wc.lpfnWndProc = LabelWndProc;
@@ -123,7 +123,7 @@ int Ginitgraphics (void) {
         wc.lpszMenuName = 0;
         wc.lpszClassName = "LabelClass";
         if (!(rtn = RegisterClass (&wc)))
-            panic (POS, "GXinit", "register class rtn = %d", (int) rtn);
+            panic1 (POS, "GXinit", "register class rtn = %d", (int) rtn);
     }
     if (getenv ("LEFTY3BMOUSE"))
         twobmouse = FALSE;
@@ -134,7 +134,7 @@ int Ginitgraphics (void) {
     deffont = GetStockObject (SYSTEM_FONT);
 #ifndef FEATURE_MS
     if (!(Gxfp = fopen ("/dev/windows", "r")))
-        panic (POS, "GXinit", "cannot open windows device");
+        panic1 (POS, "GXinit", "cannot open windows device");
     Gxfd = fileno (Gxfp);
 #endif
     Gpopdownflag = FALSE;

diff --git a/cmd/lefty/ws/mswin32/gmenu.c b/cmd/lefty/ws/mswin32/gmenu.c
index 9871e8f60b6035a29c7516f2b2292e0ff50ded9c..a320cfb42a3a922f43072efe2e573d5ab360a31a 100644 (file)
--- a/cmd/lefty/ws/mswin32/gmenu.c
+++ b/cmd/lefty/ws/mswin32/gmenu.c
@@ -107,7 +107,7 @@ int GMmenudisplay (Gwidget_t *parent, Gwidget_t *widget) {
     TrackPopupMenu (widget->w, flag, p.x, p.y, 0, parent->w, NULL);
     PostMessage (parent->w, WM_COMMAND, 999, 0);
     if (!GetMessage(&msg, parent->w, WM_COMMAND, WM_COMMAND))
-        panic (POS, "GMmenudisplay", "exit code in GetMessage");
+        panic1 (POS, "GMmenudisplay", "exit code in GetMessage");
     TranslateMessage(&msg);
     DispatchMessage(&msg);
     Gpopdownflag = TRUE;

diff --git a/cmd/lefty/ws/x11/gtext.c b/cmd/lefty/ws/x11/gtext.c
index b35d4a6646af3e4a7389285714a18bcb010a9502..3b286b178d45459aa700108290338587ab21b461 100644 (file)
--- a/cmd/lefty/ws/x11/gtext.c
+++ b/cmd/lefty/ws/x11/gtext.c
@@ -263,7 +263,7 @@ int GTgetwidgetattr (Gwidget_t *widget, int attrn, Gwattr_t *attrp) {
             else if (mode == XawtextRead)
                 attrp[ai].u.t = "output";
             else {
-                panic (POS, "GTgetwidgetattr", "unexpected text mode");
+                panic1 (POS, "GTgetwidgetattr", "unexpected text mode");
                 return -1;
             }
             break;