From 6b94dd6bcb0f129fe180190d6229eb54ded67a72 Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Sat, 28 Sep 2013 21:27:11 +0200 Subject: [PATCH] Script binding vfuncs should be static --- binding-mruby/binding-mruby.cpp | 8 ++++---- binding-mruby/mrb-ext/kernel.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/binding-mruby/binding-mruby.cpp b/binding-mruby/binding-mruby.cpp index 8f5d516..7de6e70 100644 --- a/binding-mruby/binding-mruby.cpp +++ b/binding-mruby/binding-mruby.cpp @@ -48,8 +48,8 @@ #include "binding-types.h" #include "mrb-ext/marshal.h" -void mrbBindingExecute(); -void mrbBindingTerminate(); +static void mrbBindingExecute(); +static void mrbBindingTerminate(); ScriptBinding scriptBindingImpl = { @@ -352,7 +352,7 @@ runRMXPScripts(mrb_state *mrb, mrbc_context *ctx) mrb_close(scriptMrb); } -void mrbBindingExecute() +static void mrbBindingExecute() { mrb_state *mrb = mrb_open(); @@ -389,7 +389,7 @@ void mrbBindingExecute() mrb_close(mrb); } -void mrbBindingTerminate() +static void mrbBindingTerminate() { mrb_state *mrb = static_cast(gState->bindingData()); MrbData *data = static_cast(mrb->ud); diff --git a/binding-mruby/mrb-ext/kernel.cpp b/binding-mruby/mrb-ext/kernel.cpp index 9056701..54f9264 100644 --- a/binding-mruby/mrb-ext/kernel.cpp +++ b/binding-mruby/mrb-ext/kernel.cpp @@ -34,6 +34,7 @@ #include "eventthread.h" #include "exception.h" #include "filesystem.h" +#include "binding.h" #include @@ -162,7 +163,7 @@ MRB_FUNCTION(kernelExit) { MRB_FUN_UNUSED_PARAM; - mrbBindingTerminate(); + scriptBinding->terminate(); return mrb_nil_value(); }