From bb5a398d6f5574412dc748d083c44a240bca52f4 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Fri, 4 Feb 2011 20:43:29 +0000
Subject: [PATCH] 64bit gtk fixes failed to merge. why??

---
 desmume/src/gtk/cheatsGTK.cpp        | 3 +++
 desmume/src/gtk/main.cpp             | 6 ++++++
 desmume/src/gtk/tools/ioregsView.cpp | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/desmume/src/gtk/cheatsGTK.cpp b/desmume/src/gtk/cheatsGTK.cpp
index d8839b6e6..6045bdfdb 100644
--- a/desmume/src/gtk/cheatsGTK.cpp
+++ b/desmume/src/gtk/cheatsGTK.cpp
@@ -27,6 +27,9 @@
 #include "main.h"
 #include "desmume.h"
 
+#undef GPOINTER_TO_INT
+#define GPOINTER_TO_INT(p) ((gint)  (glong) (p))
+
 enum {
     COLUMN_ENABLED,
     COLUMN_SIZE,
diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp
index 4463764b9..c2a82cb6c 100644
--- a/desmume/src/gtk/main.cpp
+++ b/desmume/src/gtk/main.cpp
@@ -66,6 +66,12 @@
 
 #include "DeSmuME.xpm"
 
+#undef GPOINTER_TO_INT
+#define GPOINTER_TO_INT(p) ((gint)  (glong) (p))
+
+#undef GPOINTER_TO_UINT
+#define GPOINTER_TO_UINT(p) ((guint)  (glong) (p))
+
 #define EMULOOP_PRIO (G_PRIORITY_HIGH_IDLE + 20)
 
 #if GTK_CHECK_VERSION(2,10,0)
diff --git a/desmume/src/gtk/tools/ioregsView.cpp b/desmume/src/gtk/tools/ioregsView.cpp
index 77a574f53..5dc20af1e 100644
--- a/desmume/src/gtk/tools/ioregsView.cpp
+++ b/desmume/src/gtk/tools/ioregsView.cpp
@@ -25,6 +25,9 @@
 
 #include "../MMU.h"
 
+#undef GPOINTER_TO_INT
+#define GPOINTER_TO_INT(p) ((gint)  (glong) (p))
+
 #define SHORTNAME "ioregs"
 #define TOOL_NAME "IO regs view"