From 71231d8c24e70cb2f452f66275f01593a483dbea Mon Sep 17 00:00:00 2001
From: yabause <yabause@users.sf.net>
Date: Thu, 28 Nov 2013 00:51:09 +0000
Subject: [PATCH] Ported some modifications from trunk, also set the version
 number.

---
 desmume/configure.ac          | 4 ++--
 desmume/src/gtk/glx_3Demu.cpp | 2 +-
 desmume/src/gtk/glx_3Demu.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/desmume/configure.ac b/desmume/configure.ac
index 2663a4472..6f25118f4 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -1,7 +1,7 @@
 dnl --- Package name is first argument to AC_INIT
 dnl --- Release version is second argument to AC_INIT
 
-AC_INIT(desmume, [svn])
+AC_INIT(desmume, [0.9.10])
 
 dnl -- find host architecture for some os specific libraries
 AC_CANONICAL_HOST
@@ -13,7 +13,7 @@ case $host in
 esac
 AC_SUBST(desmume_arch)
 
-AM_INIT_AUTOMAKE([1.10 subdir-objects])
+AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax])
 
 dnl -- make sure we have a c++ compiler
 AC_PROG_CXX
diff --git a/desmume/src/gtk/glx_3Demu.cpp b/desmume/src/gtk/glx_3Demu.cpp
index a0546b946..628fa6cd3 100644
--- a/desmume/src/gtk/glx_3Demu.cpp
+++ b/desmume/src/gtk/glx_3Demu.cpp
@@ -31,7 +31,7 @@ static bool glx_init(void) { return true; }
 static GLXContext ctx;
 static GLXPbuffer pbuf;
 
-void deinit_glx_3Demu(void)
+int deinit_glx_3Demu(void)
 {
     Display *dpy = glXGetCurrentDisplay();
 
diff --git a/desmume/src/gtk/glx_3Demu.h b/desmume/src/gtk/glx_3Demu.h
index aaaec6d0b..42b070a25 100644
--- a/desmume/src/gtk/glx_3Demu.h
+++ b/desmume/src/gtk/glx_3Demu.h
@@ -20,5 +20,5 @@
 
 #ifdef HAVE_GL_GLX
 int  init_glx_3Demu(void);
-void deinit_glx_3Demu(void);
+int  deinit_glx_3Demu(void);
 #endif