From d1c29c88a04cf0219349790c2262760dd7549f57 Mon Sep 17 00:00:00 2001
From: mazze <mazze@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 27 May 2012 15:07:54 +0000
Subject: [PATCH] The first function in the plugin must return a pointer to the
 plugin_table. Fixed build of DMS plugin.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@44888 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/devs/diskimage/plugins/mmakefile.src | 4 ++--
 workbench/devs/diskimage/plugins/stub_aros.c   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/workbench/devs/diskimage/plugins/mmakefile.src b/workbench/devs/diskimage/plugins/mmakefile.src
index ff2ba3a850..c72898f989 100644
--- a/workbench/devs/diskimage/plugins/mmakefile.src
+++ b/workbench/devs/diskimage/plugins/mmakefile.src
@@ -2,7 +2,7 @@
 include $(TOP)/config/make.cfg
 
 USER_CFLAGS := -DABIV1 -DMIN_OS_VERSION=39 $(BASE_CFLAGS) -DCATCOMP_NUMBERS -D__NOLIBBASE__ -DUSE_FLAC -DUSE_MPG123 -DUSE_VORBIS -DUSE_WAVPACK
-USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../include
+USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/../include -I$(SRCDIR)/$(CURDIR)/../dms
 TARGETDIR := $(AROS_DEVS)/DiskImage
 
 #MM- workbench-devs-diskimage-plugins : \
@@ -101,7 +101,7 @@ CFILES := dmg/dmg dmg/base64 dmg/adc
 CFILES := ../dms/crc_csum ../dms/getbits ../dms/tables ../dms/maketbl ../dms/u_init \
 	../dms/u_deep ../dms/u_heavy ../dms/u_medium ../dms/u_quick ../dms/u_rle
 
-%build_prog mmake=workbench-devs-diskimage-dms progname=DMS files="stub_aros $(CFILES)" \
+%build_prog mmake=workbench-devs-diskimage-dms progname=DMS files="stub_aros dms $(CFILES)" \
     targetdir=$(TARGETDIR) uselibs="diskimagesupport rom" usestartup=no
 
 %build_prog mmake=workbench-devs-diskimage-fdi progname=FDI files="stub_aros fdi/fdi fdi/fdi2raw" \
diff --git a/workbench/devs/diskimage/plugins/stub_aros.c b/workbench/devs/diskimage/plugins/stub_aros.c
index e15152a5c5..126fc1fbb2 100644
--- a/workbench/devs/diskimage/plugins/stub_aros.c
+++ b/workbench/devs/diskimage/plugins/stub_aros.c
@@ -1,4 +1,8 @@
-int LibNull(void)
+#include <devices/diskimage.h>
+
+extern struct DiskImagePluginTable plugin_table;
+
+void *LibNull(void)
 {
-    return -1;
+    return &plugin_table;
 }
-- 
2.11.4.GIT