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

diff --git a/cmd/lefty/common.c b/cmd/lefty/common.c
index 30d1368a8d18b5e356afef62b207dc37a9b828b2..bb56945e81f17e7505c111eeca447d693b6e6840 100644 (file)
--- a/cmd/lefty/common.c
+++ b/cmd/lefty/common.c
@@ -77,9 +77,9 @@ int init (char *aout) {
     if (getenv ("INNETSCAPE"))
         innetscape = TRUE, nswin = getenv ("NSWIN");
     if (!(pathp = malloc (PATHINCR * PATHSIZE)))
-        panic (POS, "init", "pathp malloc failed");
+        panic1 (POS, "init", "pathp malloc failed");
     if (!(cmdp = malloc (CMDINCR * CMDSIZE)))
-        panic (POS, "init", "cmdp malloc failed");
+        panic1 (POS, "init", "cmdp malloc failed");
     shellpath = getenv ("PATH");
 #ifdef FEATURE_WIN32
     GetModuleFileName (hinstance, buf, 260);
@@ -96,7 +96,7 @@ int init (char *aout) {
         s1 = aout;
     *s1 = 0;
     if (!(leftypath = malloc (PATHINCR * PATHSIZE)))
-        panic (POS, "init", "leftypath malloc failed");
+        panic1 (POS, "init", "leftypath malloc failed");
     leftypath[0] = 0;
     if ((s1 = getenv ("LEFTYPATH"))) {
         strcat (leftypath, s1);
@@ -369,7 +369,7 @@ void warning (char *file, int line, char *func, char *fmt, ...) {
 }
 
 /* varargs function for printing an error message and aborting */
-void panic (char *file, int line, char *func, char *fmt, ...) {
+void panic1 (char *file, int line, char *func, char *fmt, ...) {
     va_list args;
 
 #ifndef FEATURE_MS

diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h
index 56dfa31bdb6452908e56f13a6f9c13cba5aeb9b0..de198a60340c4aefb2016aee7734a6534c601bcd 100644 (file)
--- a/cmd/lefty/common.h
+++ b/cmd/lefty/common.h
@@ -99,7 +99,7 @@ void term (void);
 char *buildpath (char *, int);
 char *buildcommand (char *, char *, int, int, char *);
 void warning (char *, int, char *, char *, ...);
-void panic (char *, int, char *, char *, ...);
+void panic1 (char *, int, char *, char *, ...);
 void panic2 (char *, int, char *, char *, ...);
 #endif /* _COMMON_H */