* merged with tip (040f180a056b)

[cacao.git] / src / vm / jit / patcher-common.c

diff --git a/src/vm/jit/patcher-common.c b/src/vm/jit/patcher-common.c
index dee3d3de592714dc863fe3a2d66db4a9dde01a56..4128205c4036be8a3f7cdb14293172523f303d8b 100644 (file)
--- a/src/vm/jit/patcher-common.c
+++ b/src/vm/jit/patcher-common.c
@@ -40,18 +40,17 @@
 #include "toolbox/list.h"
 #include "toolbox/logging.h"           /* XXX remove me! */
 
-#include "vm/exceptions.h"
+#include "vm/exceptions.hpp"
 #include "vm/initialize.h"
+#include "vm/options.h"
 #include "vm/resolve.h"
-#include "vm/vm.h"                     /* for vm_abort */
+#include "vm/vm.hpp"                     /* for vm_abort */
 
 #include "vm/jit/code.h"
 #include "vm/jit/disass.h"
 #include "vm/jit/jit.h"
 #include "vm/jit/patcher-common.h"
 
-#include "vmcore/options.h"
-
 
 /* patcher_function_list *******************************************************
 
@@ -175,8 +174,7 @@ static patchref_t *patcher_list_find(codeinfo *code, u1 *pc)
 
 *******************************************************************************/
 
-void patcher_add_patch_ref(jitdata *jd, functionptr patcher, voidptr ref,
-                           s4 disp)
+void patcher_add_patch_ref(jitdata *jd, functionptr patcher, void* ref, s4 disp)
 {
        codegendata *cd;
        codeinfo    *code;