* src/vm/linker.cpp,

[cacao.git] / src / vm / descriptor.h

diff --git a/src/vm/descriptor.h b/src/vm/descriptor.h
index 1f104a0f770574452bd2ec52756b6d3d803055e4..bf6c69efb458d7d3360f72bf23170af3b75a18a7 100644 (file)
--- a/src/vm/descriptor.h
+++ b/src/vm/descriptor.h
@@ -42,9 +42,9 @@ typedef struct methoddesc      methoddesc;
 
 #include "toolbox/hashtable.h"
 
-#include "vm/class.h"
+#include "vm/class.hpp"
 #include "vm/global.h"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/references.h"
 #include "vm/utf8.h"
 
@@ -151,6 +151,10 @@ struct methoddesc {
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 descriptor_pool * descriptor_pool_new(classinfo *referer);
 
 bool descriptor_pool_add_class(descriptor_pool *pool,utf *name);
@@ -182,6 +186,10 @@ void descriptor_debug_print_paramdesc(FILE *file,paramdesc *d);
 void descriptor_pool_debug_dump(descriptor_pool *pool, FILE *file);
 #endif /* !defined(NDEBUG) */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _DESCRIPTOR_H */