From b66d66e82e3309cedb9794cf39695907ae7610c8 Mon Sep 17 00:00:00 2001
From: Daryl Borth <dborth@gmail.com>
Date: Thu, 2 Aug 2018 10:32:54 -0600
Subject: [PATCH] compiles on latest devkitPPC/libogc. Note: crashes as soon as
 wiimote is connected with the freetype portlib supplied by devkitPPC. using
 an older freetype works.

---
 Makefile.wii         | 2 +-
 source/networkop.cpp | 2 +-
 source/snes9xgx.cpp  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.wii b/Makefile.wii
index e8f6e8d..09e70cb 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -43,7 +43,7 @@ LDFLAGS		=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
 LIBS	:=	-ldi -liso9660 -lpng -lmxml \
-			-lfat -lwiiuse -lz -lbte -lasnd -logc -lvorbisidec -lfreetype -ltinysmb
+			-lfat -lwiiuse -lz -lbte -lasnd -logc -lvorbisidec -logg -lfreetype -ltinysmb
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
 # include and lib
diff --git a/source/networkop.cpp b/source/networkop.cpp
index 4b03f91..f737018 100644
--- a/source/networkop.cpp
+++ b/source/networkop.cpp
@@ -172,7 +172,7 @@ bool InitializeNetwork(bool silent)
 				break;
 		}
 #else
-		networkInit = !(if_config(wiiIP, NULL, NULL, true) < 0);
+		networkInit = !(if_config(wiiIP, NULL, NULL, true, 10) < 0);
 #endif
 
 		CancelAction();
diff --git a/source/snes9xgx.cpp b/source/snes9xgx.cpp
index 1e151c9..9658670 100644
--- a/source/snes9xgx.cpp
+++ b/source/snes9xgx.cpp
@@ -177,7 +177,7 @@ void ShutdownCB()
 {
 	ShutdownRequested = 1;
 }
-void ResetCB()
+void ResetCB(u32 irq, void *ctx)
 {
 	ResetRequested = 1;
 }
@@ -312,7 +312,7 @@ bool SaneIOS(u32 ios)
 static bool gecko = false;
 static mutex_t gecko_mutex = 0;
 
-static ssize_t __out_write(struct _reent *r, int fd, const char *ptr, size_t len)
+static ssize_t __out_write(struct _reent *r, void* fd, const char *ptr, size_t len)
 {
 	if (!gecko || len == 0)
 		return len;