Merged with tip.

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

diff --git a/src/vm/builtin.h b/src/vm/builtin.h
index 757467271d431cb981afda2a5dfc7342792bd334..f898706b83525c3a4026b4282e62933a503ff0d7 100644 (file)
--- a/src/vm/builtin.h
+++ b/src/vm/builtin.h
@@ -26,6 +26,10 @@
 #ifndef _BUILTIN_H
 #define _BUILTIN_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* forward typedefs ***********************************************************/
 
 typedef struct builtintable_entry builtintable_entry;
@@ -120,9 +124,9 @@ bool builtintable_replace_function(void *iptr);
  * ICMD_BUILTIN3.)
  */
 
-bool builtin_instanceof(java_handle_t *obj, classinfo *class);
+bool builtin_instanceof(java_handle_t *obj, classinfo *c);
 /* NOT AN OP */
-bool builtin_checkcast(java_handle_t *obj, classinfo *class);
+bool builtin_checkcast(java_handle_t *obj, classinfo *c);
 /* NOT AN OP */
 bool builtin_arrayinstanceof(java_handle_t *h, classinfo *targetclass);
 /* NOT AN OP */
@@ -327,6 +331,10 @@ s8 builtin_currenttimemillis(void);
 void builtin_print_cycles_stats(FILE *file);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _BUILTIN_H */