* src/threads/posix/thread-posix.hpp (vm/jit/stacktrace.hpp): Removed

to break cyclic dependency.
(threads_get_current_stackframeinfo): Use struct keyword.
(threads_set_current_stackframeinfo): Likewise.
* src/threads/threadlist.cpp (vm/jit/stacktrace.hpp): Added.

diff --git a/src/threads/posix/thread-posix.hpp b/src/threads/posix/thread-posix.hpp
index ce83236ef26842dfa89c26516c2d92d88a2e0d71..baf99798118e543495505e8b5df4ae3d906c4dd2 100644 (file)
--- a/src/threads/posix/thread-posix.hpp
+++ b/src/threads/posix/thread-posix.hpp
@@ -205,8 +205,6 @@ inline static threadobject* thread_get_current(void);
 # include "vm/jit/replace.hpp"
 #endif
 
-#include "vm/jit/stacktrace.hpp"
-
 #if defined(ENABLE_INTRP)
 #include "vm/jit/intrp/intrp.h"
 #endif
@@ -271,12 +269,12 @@ inline static void thread_set_current(threadobject* t)
 }
 
 
-inline static stackframeinfo_t *threads_get_current_stackframeinfo(void)
+inline static struct stackframeinfo_t* threads_get_current_stackframeinfo(void)
 {
        return THREADOBJECT->_stackframeinfo;
 }
 
-inline static void threads_set_current_stackframeinfo(stackframeinfo_t *sfi)
+inline static void threads_set_current_stackframeinfo(struct stackframeinfo_t* sfi)
 {
        THREADOBJECT->_stackframeinfo = sfi;
 }

diff --git a/src/threads/threadlist.cpp b/src/threads/threadlist.cpp
index 80f2c3352be2175fc89086d8860780b4864fb009..b791fcdde75988d7604e58892a0b016148f07915 100644 (file)
--- a/src/threads/threadlist.cpp
+++ b/src/threads/threadlist.cpp
@@ -34,6 +34,8 @@
 #include "toolbox/list.hpp"
 #include "toolbox/logging.h"
 
+#include "vm/jit/stacktrace.hpp"
+
 
 /* class variables */