* src/vm/jit/oprofile-agent.cpp: Set source formatting to c++.

[cacao.git] / src / vmcore / classcache.h

diff --git a/src/vmcore/classcache.h b/src/vmcore/classcache.h
index bdefa5e18bba0aefc1c732ee26f8be55dda06ca1..04d97f15bec6e8c791c0685819eb8c112052cbb6 100644 (file)
--- a/src/vmcore/classcache.h
+++ b/src/vmcore/classcache.h
@@ -1,9 +1,7 @@
 /* src/vmcore/classcache.h - loaded class cache and loading constraints
 
-   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.
 
@@ -29,6 +27,11 @@
 #define _CLASSCACHE_H
 
 #include "config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "vm/types.h"
 
 #include <stdio.h>  /* for FILE */
@@ -42,6 +45,7 @@
 #include "vm/global.h"
 
 #include "vmcore/class.h"
+#include "vmcore/loader.h"
 #include "vmcore/references.h"
 
 
@@ -112,7 +116,7 @@ struct classcache_class_entry
 
 struct classcache_loader_entry
 {
-       classloader              *loader;     /* class loader object              */
+       classloader_t            *loader;     /* class loader object              */
        classcache_loader_entry  *next;       /* next loader entry in the list    */
 };
 
@@ -128,17 +132,17 @@ typedef void (*classcache_foreach_functionptr_t)(classinfo *, void *);
 bool classcache_init(void);
 void classcache_free(void);
 
-classinfo * classcache_lookup(classloader *initloader,utf *classname);
-classinfo * classcache_lookup_defined(classloader *defloader,utf *classname);
-classinfo * classcache_lookup_defined_or_initiated(classloader *loader,utf *classname);
+classinfo * classcache_lookup(classloader_t *initloader,utf *classname);
+classinfo * classcache_lookup_defined(classloader_t *defloader,utf *classname);
+classinfo * classcache_lookup_defined_or_initiated(classloader_t *loader,utf *classname);
 
 bool classcache_store_unique(classinfo *cls);
-classinfo * classcache_store(classloader *initloader,classinfo *cls,bool mayfree);
+classinfo * classcache_store(classloader_t *initloader,classinfo *cls,bool mayfree);
 classinfo * classcache_store_defined(classinfo *cls);
 
 #if defined(ENABLE_VERIFIER)
-bool classcache_add_constraint(classloader *a,classloader *b,utf *classname);
-bool classcache_add_constraints_for_params(classloader *a,classloader *b,
+bool classcache_add_constraint(classloader_t *a,classloader_t *b,utf *classname);
+bool classcache_add_constraints_for_params(classloader_t *a,classloader_t *b,
                                                                                   methodinfo *m);
 #endif
 
@@ -156,6 +160,10 @@ void classcache_get_loaded_classes(s4 *class_count_ptr,
 void classcache_debug_dump(FILE *file,utf *only);
 #endif
        
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _CLASSCACHE_H */
 
 /*