Merged trunk and subtype.

[cacao.git] / src / toolbox / logging.h

diff --git a/src/toolbox/logging.h b/src/toolbox/logging.h
index 3af0a0df971404b2f67b3966481cc0b0e501df79..bcf2e65389eb0037c7f7fe153f9899043c758b0d 100644 (file)
--- a/src/toolbox/logging.h
+++ b/src/toolbox/logging.h
@@ -1,9 +1,7 @@
 /* src/toolbox/logging.h - contains logging functions
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: logging.h 7246 2007-01-29 18:49:05Z twisti $
-
 */
 
 
@@ -35,16 +31,14 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "vmcore/class.h"
-#include "vmcore/method.h"
-#include "vmcore/utf8.h"
-
+#include "vm/class.h"
+#include "vm/method.h"
+#include "vm/utf8.h"
 
-/*500 is to small for eclipse traces, (builtin_trace_args, perhaps the
-buffer should be created there dynamically, if the text is longer,
-instead of setting the size for all invocations that big*/
 
-#define MAXLOGTEXT  16383 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* function prototypes ********************************************************/
 
@@ -69,6 +63,10 @@ void log_message_method(const char *msg, methodinfo *m);
 #define log_text(s) log_println("%s", (s))
 #define dolog log_println
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LOGGING_H */