diff --git a/meson.build b/meson.build index d9da0d84..99a6f1ed 100644 --- a/meson.build +++ b/meson.build @@ -316,7 +316,6 @@ cell = custom_target('cell', install_headers('source/cell.h', 'source/jsffi.h') install_headers('source/quickjs.h') install_headers('source/wota.h') -install_headers('source/qjs_wota.h') tests = [ 'spawn_actor', diff --git a/source/cell.c b/source/cell.c index 8ff523db..3ac8e841 100644 --- a/source/cell.c +++ b/source/cell.c @@ -28,10 +28,6 @@ #define WOTA_IMPLEMENTATION #include "wota.h" -#include "qjs_wota.h" - -#define BLOB_IMPLEMENTATION -#include "blob.h" #define STB_DS_IMPLEMENTATION #include "stb_ds.h" diff --git a/source/cell.h b/source/cell.h index 1def3d1b..14c89c9e 100644 --- a/source/cell.h +++ b/source/cell.h @@ -110,9 +110,8 @@ JSValue bool2js(JSContext *js, int b); double js2number(JSContext *js, JSValue v); JSValue number2js(JSContext *js, double g); -void *js2wota(JSContext *js, JSValue v); -JSValue wota2js(JSContext *js, void *v); - +JSValue wota2value(JSContext *js, void *v); +void *value2wota(JSContext *js, JSValue v, JSValue replacer, size_t *bytes); // Macros to help with creating scripts #define MIST_CFUNC_DEF(name, length, func1, props) { name, props, JS_DEF_CFUNC, 0, .u = { .func = { length, JS_CFUNC_generic, { .generic = func1 } } } } diff --git a/source/jsffi.c b/source/jsffi.c index 84b8400b..4b95a774 100644 --- a/source/jsffi.c +++ b/source/jsffi.c @@ -12,8 +12,6 @@ #include #include "cell.h" -#include "qjs_wota.h" - #if defined(_WIN32) #include #else diff --git a/source/qjs_actor.c b/source/qjs_actor.c index 86e9e91b..8c8a49f8 100644 --- a/source/qjs_actor.c +++ b/source/qjs_actor.c @@ -1,8 +1,5 @@ -#include "qjs_actor.h" -#include "qjs_wota.h" #include "cell.h" -#include #include #include diff --git a/source/qjs_wota.c b/source/qjs_wota.c index 1383f5d1..3a0eec6f 100644 --- a/source/qjs_wota.c +++ b/source/qjs_wota.c @@ -1,4 +1,3 @@ -#include "qjs_wota.h" #include "cell.h" #include "wota.h" diff --git a/source/qjs_wota.h b/source/qjs_wota.h deleted file mode 100644 index cf8a6710..00000000 --- a/source/qjs_wota.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef QJS_WOTA_H -#define QJS_WOTA_H - -#include "cell.h" -#include "wota.h" - -JSValue js_wota_use(JSContext*); - -void *value2wota(JSContext*, JSValue val, JSValue replacer, size_t *bytes); -JSValue wota2value(JSContext*, void*); - -#endif