Implement FreeBSD's dlfunc function to avoid ISO warnings on dlsym - thanks to drizztbsd for find public domain code :)

1 files changed, 13 insertions, 4 deletions

diff --git a/src/rc-plugin.c b/src/rc-plugin.c
index 2c8bfff5..66ffeb5c 100644
--- a/src/rc-plugin.c
+++ b/src/rc-plugin.c
@@ -29,6 +29,19 @@ typedef struct plugin
 
 static plugin_t *plugins = NULL;
 
+#ifndef __FreeBSD__
+dlfunc_t dlfunc (void * __restrict handle, const char * __restrict symbol)
+{
+	union {
+		void *d;
+		dlfunc_t f;
+	} rv;
+
+	rv.d = dlsym (handle, symbol);
+	return (rv.f);
+}
+#endif
+
 void rc_plugin_load (void)
 {
 	char **files;
@@ -62,11 +75,7 @@ void rc_plugin_load (void)
 		func = rc_xmalloc (sizeof (char *) * len);
 		snprintf (func, len, "_%s_hook", file);
 
-#ifdef __FreeBSD__
 		fptr = (int (*)(rc_hook_t, const char*)) dlfunc (h, func);
-#else
-		fptr = (int (*)(rc_hook_t, const char*)) dlsym (h, func);
-#endif
 		if (! fptr) {
 			eerror ("`%s' does not expose the symbol `%s'", p, func);
 			dlclose (h);