From bcbedc8f40dc66469dee46ba8dc39add6a3e3978 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Tue, 5 Feb 2013 19:05:44 +0100
Subject: [PATCH] Updated code calling opk_extract_file().

I changed the return type from char* to void* in libopk, now updating
the gmenu2x code to match.
---
 src/imageio.cpp | 2 +-
 src/linkapp.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/imageio.cpp b/src/imageio.cpp
index 8f2323b..577328d 100644
--- a/src/imageio.cpp
+++ b/src/imageio.cpp
@@ -34,7 +34,7 @@ SDL_Surface *loadPNG(const std::string &path) {
 #ifdef HAVE_LIBOPK
 	std::string::size_type pos;
 	struct ParserData *pdata = NULL;
-	char *buffer = NULL, *param;
+	void *buffer = NULL, *param;
 #endif
 
 	// Create and initialize the top-level libpng struct.
diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index 474dce1..aea661d 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -387,7 +387,8 @@ void LinkApp::showManual() {
 			return;
 		}
 
-		buf = ptr = opk_extract_file(pdata, manual.c_str());
+		buf = ptr = reinterpret_cast<char *>(
+				opk_extract_file(pdata, manual.c_str()));
 		opk_close(pdata);
 
 		if (!buf) {