Merged branch subtype-trunk into default.

[cacao.git] / src / vm / jit / builtin.hpp

diff --git a/src/vm/jit/builtin.hpp b/src/vm/jit/builtin.hpp
index 2f94b09fd9c3df8d4a43b69c74f1f5661b5f6cb0..60b58e25c672497252ad3d94c99c1377b1a950c6 100644 (file)
--- a/src/vm/jit/builtin.hpp
+++ b/src/vm/jit/builtin.hpp
@@ -36,9 +36,9 @@ typedef struct builtintable_entry builtintable_entry;
 #include "arch.h"
 #include "md-abi.h"
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
-#include "vm/descriptor.h"
+#include "vm/descriptor.hpp"
 #include "vm/utf8.h"
 
 
@@ -125,7 +125,9 @@ bool builtintable_replace_function(void *iptr);
  * ICMD_BUILTIN3.)
  */
 
+#if USES_NEW_SUBTYPE
 bool fast_subtype_check(struct _vftbl *, struct _vftbl *);
+#endif
 
 bool builtin_instanceof(java_handle_t *obj, classinfo *c);
 /* NOT AN OP */
@@ -282,14 +284,10 @@ s4 builtin_dcmpg(double a, double b);
 double builtin_drem(double a, double b);
 #define BUILTIN_drem (functionptr) builtin_drem
 
-s8       builtin_i2l(s4 i);
-/* NOT AN OP */
 float    builtin_i2f(s4 i);
 #define BUILTIN_i2f (functionptr) builtin_i2f
 double   builtin_i2d(s4 i);
 #define BUILTIN_i2d (functionptr) builtin_i2d
-s4       builtin_l2i(s8 l);
-/* NOT AN OP */
 float    builtin_l2f(s8 l);
 #define BUILTIN_l2f (functionptr) builtin_l2f
 double   builtin_l2d(s8 l);