]> Nishi Git Mirror - gwion.git/commitdiff
:art: DL macros
authorJérémie Astor <fennecdjay@gmail.com>
Tue, 1 Dec 2020 12:11:08 +0000 (13:11 +0100)
committerJérémie Astor <fennecdjay@gmail.com>
Tue, 1 Dec 2020 12:11:08 +0000 (13:11 +0100)
ast
plug
src/plug.c
util

diff --git a/ast b/ast
index 31bfb80acafe4235a0446cde7c93b0e3687d503c..2563cee7e607e715fac20eba6583d6561f2172e9 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 31bfb80acafe4235a0446cde7c93b0e3687d503c
+Subproject commit 2563cee7e607e715fac20eba6583d6561f2172e9
diff --git a/plug b/plug
index 88428160d188e93ff212bd30dc077dd23c704236..041925d6243189024049a7a842fd1503fb649415 160000 (submodule)
--- a/plug
+++ b/plug
@@ -1 +1 @@
-Subproject commit 88428160d188e93ff212bd30dc077dd23c704236
+Subproject commit 041925d6243189024049a7a842fd1503fb649415
index eeaceeca34c82f474456a20f7768b76e88e26da4..81080c02ae897568a3dfa472baef2b81687ecaea 100644 (file)
@@ -21,22 +21,6 @@ typedef void*  (*modini)(const struct Gwion_*, const Vector);
 typedef void*  (*modend)(const struct Gwion_*, void*);
 typedef m_str* (*gwdeps)(void);
 
-#define STR_EXPAND(tok) #tok
-#define STR(tok) STR_EXPAND(tok)
-#ifndef BUILD_ON_WINDOWS
-#include <dlfcn.h>
-#define DLOPEN(dl, b) dlopen(dl, b)
-#define DLSYM(dl, t, a) (t)(intptr_t)dlsym(dl, STR(a));
-#define DLCLOSE(dl) dlclose(dl);
-#define DLERROR() dlerror()
-#else
-#include "windows.h"
-#define DLOPEN(dl, b) LoadLibrary(dl)
-#define DLSYM(dl, t, a) (t)(intptr_t)GetProcAddress(dl, STR(a));
-#define DLCLOSE(dl) FreeLibrary(dl);
-#define DLERROR() "plugin"
-#endif
-
 struct PlugHandle {
   MemPool mp;
   Map map;
diff --git a/util b/util
index 18330ebb0d167c9f1e30cdc97bfc0c86fa329dc0..d43badb977921b88061f70bb5a6fcf228e4ec121 160000 (submodule)
--- a/util
+++ b/util
@@ -1 +1 @@
-Subproject commit 18330ebb0d167c9f1e30cdc97bfc0c86fa329dc0
+Subproject commit d43badb977921b88061f70bb5a6fcf228e4ec121