From a6c6f6b354fa1772f89bfbcc0b19a2b439ae50dd Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Thu, 13 May 2010 13:43:24 +0000
Subject: [PATCH] Make some global variable with a common name static to avoid
 clashes.

---
 desmume/src/gtk/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp
index 33ed8f430..f60a26bff 100644
--- a/desmume/src/gtk/main.cpp
+++ b/desmume/src/gtk/main.cpp
@@ -563,8 +563,8 @@ GdkInterpType Interpolation = GDK_INTERP_BILINEAR;
 static GtkWidget *pWindow;
 static GtkWidget *pStatusBar;
 static GtkWidget *pDrawingArea;
-GtkActionGroup * action_group;
-GtkUIManager *ui_manager;
+static GtkActionGroup * action_group;
+static GtkUIManager *ui_manager;
 
 struct nds_screen_t {
     guint gap_size;