Merge from subtype.

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

diff --git a/src/toolbox/logging.h b/src/toolbox/logging.h
index 188f5e31c4145ddbdd8ea452fe2063eb0f31de81..eed61bd8dd9173fbc10d2483de899d05c97366d7 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 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,14 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Reinhard Grafl
-
-   Changes: Christan Thalinger
-
-   $Id: logging.h 4938 2006-05-22 09:06:44Z twisti $
-
 */
 
 
@@ -39,20 +29,19 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdarg.h>
 
-#include "vm/class.h"
-#include "vm/method.h"
+#include "vm/class.hpp"
+#include "vm/method.hpp"
 #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 
-
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void log_init(const char *fname);
 
 void log_start(void);
@@ -71,9 +60,13 @@ void log_message_class_message_class(const char *msg1, classinfo *c1,
                                                                         const char *msg2, classinfo *c2);
 void log_message_method(const char *msg, methodinfo *m);
 
-#define log_text log_println
+#define log_text(s) log_println("%s", (s))
 #define dolog log_println
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LOGGING_H */