* src/vm/method.h (methodinfo): Use mutex instead of java object for locking.

[cacao.git] / src / vm / jit / dseg.h

diff --git a/src/vm/jit/dseg.h b/src/vm/jit/dseg.h
index 68c1564ae3c17a359bab30594b6a274eb9baf61a..85885e3660b9ac18ce87d518c8b69ddcdc26e02b 100644 (file)
--- a/src/vm/jit/dseg.h
+++ b/src/vm/jit/dseg.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/dseg.c - data segment handling stuff
 
-   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.
 
@@ -38,10 +36,10 @@ typedef struct dsegentry dsegentry;
 
 #include "toolbox/list.h"
 
-#include "vm/jit/jit.h"
-#include "vm/jit/codegen-common.h"
+#include "vm/references.h"
 
-#include "vmcore/references.h"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/codegen-common.h"
 
 
 /* convenience macros *********************************************************/
@@ -66,6 +64,10 @@ struct dsegentry {
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void dseg_finish(jitdata *jd);
 
 s4 dseg_add_unique_s4(codegendata *cd, s4 value);
@@ -92,6 +94,10 @@ void dseg_resolve_datareferences(jitdata *jd);
 void dseg_display(jitdata *jd);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _DSEG_H */