From a4e872f5810aee91b22d79661ee39e77514a49a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Astor?= Date: Tue, 1 Dec 2020 13:11:08 +0100 Subject: [PATCH] :art: DL macros --- ast | 2 +- plug | 2 +- src/plug.c | 16 ---------------- util | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/ast b/ast index 31bfb80a..2563cee7 160000 --- a/ast +++ b/ast @@ -1 +1 @@ -Subproject commit 31bfb80acafe4235a0446cde7c93b0e3687d503c +Subproject commit 2563cee7e607e715fac20eba6583d6561f2172e9 diff --git a/plug b/plug index 88428160..041925d6 160000 --- a/plug +++ b/plug @@ -1 +1 @@ -Subproject commit 88428160d188e93ff212bd30dc077dd23c704236 +Subproject commit 041925d6243189024049a7a842fd1503fb649415 diff --git a/src/plug.c b/src/plug.c index eeaceeca..81080c02 100644 --- a/src/plug.c +++ b/src/plug.c @@ -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 -#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 18330ebb..d43badb9 160000 --- a/util +++ b/util @@ -1 +1 @@ -Subproject commit 18330ebb0d167c9f1e30cdc97bfc0c86fa329dc0 +Subproject commit d43badb977921b88061f70bb5a6fcf228e4ec121 -- 2.43.0