Merge to subtype-trunk (manually: src/vm/linker.hpp, src/vm/vftbl.hpp)

[cacao.git] / src / native / jvmti / cacaodbg.h

diff --git a/src/native/jvmti/cacaodbg.h b/src/native/jvmti/cacaodbg.h
index c6602eacbff386f0d8a00288e935c1f1ca928064..04abbd85c2a04d45fef38bc426c7a8557e85d100 100644 (file)
--- a/src/native/jvmti/cacaodbg.h
+++ b/src/native/jvmti/cacaodbg.h
@@ -25,7 +25,8 @@
 #ifndef _CACAODBG_H
 #define _CACAODBG_H
 
-#include "threads/threads-common.h"
+#include "threads/mutex.h"
+#include "threads/thread.hpp"
 #include "native/jvmti/jvmti.h"
 #include "native/include/java_lang_String.h"
 #include <ltdl.h>
@@ -112,7 +113,7 @@ cacaodbgcommunication *dbgcom;
 
 bool jvmti;                 /* jvmti agent  */
 
-extern pthread_mutex_t dbgcomlock;
+extern mutex_t dbgcomlock;
 
 jvmtiEnv* jvmti_new_environment();
 void jvmti_set_phase(jvmtiPhase p);