Just ifdef panic on darwin. Works perfectly till it's not used anymore.

diff --git a/src/toolbox/logging.h b/src/toolbox/logging.h
index 6545292b8eb0bad238c6a9aef587f8a31a0bf9e6..07a6f24ae3e245d274c46f2e2c50ebfc8d683557 100644 (file)
--- a/src/toolbox/logging.h
+++ b/src/toolbox/logging.h
@@ -27,7 +27,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: logging.h 1621 2004-11-30 13:06:55Z twisti $
+   $Id: logging.h 1636 2004-12-01 09:59:31Z twisti $
 
 */
 
@@ -37,10 +37,6 @@
 
 #include <stdio.h>
 
-/* This is to bring in the conflicting panic from darwin */
-#include <sys/mman.h>
-/*  #define panic cacao_panic */
-
 #include "vm/global.h"
 
 
@@ -62,7 +58,11 @@ void log_message_method(char *msg, methodinfo *m);
 void dolog(char *txt, ...);
 void dolog_plain(char *txt, ...); /* same as dolog without "LOG: " and newline */
 void error(char *txt, ...);
+
+/* XXX this is just a quick hack on darwin */
+#if !defined(__DARWIN__)
 void panic(char *txt);
+#endif
 
 FILE *get_logfile(); /* return the current logfile */