From 84c9d984e98065e76f02226a1b3831cca393fb3c Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Tue, 22 Jul 2014 15:06:57 +0200
Subject: [PATCH] Moved pike_get_interpreter_pointer to threads.c
---
src/interpret.c | 5 -----
src/threads.c | 4 ++++
src/threads.h | 1 +
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/interpret.c b/src/interpret.c
index 44c2af71ce..ffd6458f06 100644
--- a/src/interpret.c
+++ b/src/interpret.c
@@ -113,11 +113,6 @@ static void do_trace_call(INT32 args, dynamic_buffer *old_buf);
static void do_trace_func_return (int got_retval, struct object *o, int fun);
static void do_trace_return (int got_retval, dynamic_buffer *old_buf);
-PMOD_EXPORT struct Pike_interpreter_struct * pike_get_interpreter_pointer()
-{
- return Pike_interpreter_pointer;
-}
-
void push_sp_mark(void)
{
if(Pike_mark_sp == Pike_interpreter.mark_stack + Pike_stack_size)
diff --git a/src/threads.c b/src/threads.c
index 945c00d819..b4ae9a0bcb 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -62,6 +62,10 @@ static struct Pike_interpreter_struct static_pike_interpreter;
PMOD_EXPORT struct Pike_interpreter_struct *Pike_interpreter_pointer =
&static_pike_interpreter;
+PMOD_EXPORT struct Pike_interpreter_struct * pike_get_interpreter_pointer()
+{
+ return Pike_interpreter_pointer;
+}
#else /* CONFIGURE_TEST */
#include "pike_threadlib.h"
#endif
diff --git a/src/threads.h b/src/threads.h
index b25289da19..2b911e5dcf 100644
--- a/src/threads.h
+++ b/src/threads.h
@@ -111,6 +111,7 @@ PMOD_EXPORT void th_farm(void (*fun)(void *), void *here);
PMOD_EXPORT void call_with_interpreter(void (*func)(void *ctx), void *ctx);
PMOD_EXPORT void enable_external_threads(void);
PMOD_EXPORT void disable_external_threads(void);
+
/* Prototypes end here */
#else
#define pike_thread_yield()
--
GitLab