From c7c78865d4188050775d03a7dcb233d173c45d1b Mon Sep 17 00:00:00 2001 From: uyjulian Date: Fri, 11 Jun 2021 09:29:26 -0500 Subject: [PATCH] Avoid multiple definitions of the export table --- modules/debug/ioptrap/ioptrap.c | 2 +- modules/debug/udptty-ingame/udptty.c | 2 +- modules/iopcore/cdvdfsv/cdvdfsv.c | 2 +- modules/network/lwnbdsvr/lwnbdsvr.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/debug/ioptrap/ioptrap.c b/modules/debug/ioptrap/ioptrap.c index 641a26163..10b02f2fc 100644 --- a/modules/debug/ioptrap/ioptrap.c +++ b/modules/debug/ioptrap/ioptrap.c @@ -27,7 +27,7 @@ IRX_ID("ioptrap_driver", 1, 1); -struct irx_export_table _exp_ioptrap; +extern struct irx_export_table _exp_ioptrap; static const char *exception_type_name[] = { diff --git a/modules/debug/udptty-ingame/udptty.c b/modules/debug/udptty-ingame/udptty.c index feaa6750b..b0535c531 100644 --- a/modules/debug/udptty-ingame/udptty.c +++ b/modules/debug/udptty-ingame/udptty.c @@ -30,7 +30,7 @@ #define MODNAME "udptty" IRX_ID(MODNAME, 2, 1); -struct irx_export_table _exp_udptty; +extern struct irx_export_table _exp_udptty; #define DEVNAME "tty" diff --git a/modules/iopcore/cdvdfsv/cdvdfsv.c b/modules/iopcore/cdvdfsv/cdvdfsv.c index 37a987b1b..8d67bbf6c 100644 --- a/modules/iopcore/cdvdfsv/cdvdfsv.c +++ b/modules/iopcore/cdvdfsv/cdvdfsv.c @@ -223,7 +223,7 @@ static u8 shutdown_rpcbuf[16]; static int rpc0_thread_id, rpc1_thread_id, rpc2_thread_id, rpc_sd_thread_id; -struct irx_export_table _exp_cdvdfsv; +extern struct irx_export_table _exp_cdvdfsv; //------------------------------------------------------------------------- int _start(int argc, char *argv[]) diff --git a/modules/network/lwnbdsvr/lwnbdsvr.c b/modules/network/lwnbdsvr/lwnbdsvr.c index 3e52afd39..d9f109fdf 100644 --- a/modules/network/lwnbdsvr/lwnbdsvr.c +++ b/modules/network/lwnbdsvr/lwnbdsvr.c @@ -6,7 +6,7 @@ #define MODNAME "lwnbdsvr" IRX_ID(MODNAME, 1, 1); static int nbd_tid; -struct irx_export_table _exp_lwnbdsvr; +extern struct irx_export_table _exp_lwnbdsvr; int _start(int argc, char **argv) {