64bit gtk fixes failed to merge. why??

2011-02-04 20:43:29 +00:00 · 2011-02-04 20:43:29 +00:00 · bb5a398d6f
parent c21ce0663b
commit bb5a398d6f
3 changed files with 12 additions and 0 deletions
--- 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,
--- 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)
--- 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"