From e5e50b556b549e36c3eb5ee4411bfb95e2e68eb9 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Wed, 13 Sep 2006 22:25:37 +0000 Subject: [PATCH] 64bit compile fixes git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@106 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- contrib/camera/dialogs_common.cpp | 2 +- contrib/hydratoolz/plugin.cpp | 2 +- contrib/prtview/AboutDialog.cpp | 1 + contrib/prtview/LoadPortalFileDialog.cpp | 1 + plugins/textool/TexTool.cpp | 2 +- radiant/eclass_doom3.cpp | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/camera/dialogs_common.cpp b/contrib/camera/dialogs_common.cpp index 62019b0a..43a4e70e 100644 --- a/contrib/camera/dialogs_common.cpp +++ b/contrib/camera/dialogs_common.cpp @@ -36,7 +36,7 @@ void dialog_button_callback (GtkWidget *widget, gpointer data) ret = (int*)g_object_get_data (G_OBJECT (parent), "ret"); *loop = 0; - *ret = (int)data; + *ret = gpointer_to_int (data); } gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data) diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp index 2298db60..abc57fc3 100644 --- a/contrib/hydratoolz/plugin.cpp +++ b/contrib/hydratoolz/plugin.cpp @@ -68,7 +68,7 @@ static void dialog_button_callback (GtkWidget *widget, gpointer data) ret = (int*)gtk_object_get_data (GTK_OBJECT (parent), "ret"); *loop = 0; - *ret = (int)data; + *ret = gpointer_to_int (data); } static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data) diff --git a/contrib/prtview/AboutDialog.cpp b/contrib/prtview/AboutDialog.cpp index bd85103a..1c6b735f 100644 --- a/contrib/prtview/AboutDialog.cpp +++ b/contrib/prtview/AboutDialog.cpp @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "AboutDialog.h" #include +#include #include "version.h" #include "gtkutil/pointer.h" diff --git a/contrib/prtview/LoadPortalFileDialog.cpp b/contrib/prtview/LoadPortalFileDialog.cpp index 87f6d39b..d9984a0b 100644 --- a/contrib/prtview/LoadPortalFileDialog.cpp +++ b/contrib/prtview/LoadPortalFileDialog.cpp @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "LoadPortalFileDialog.h" #include +#include #include "stream/stringstream.h" #include "convert.h" #include "gtkutil/pointer.h" diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp index 9a95e3e4..9ba7b01b 100644 --- a/plugins/textool/TexTool.cpp +++ b/plugins/textool/TexTool.cpp @@ -38,7 +38,7 @@ static void dialog_button_callback (GtkWidget *widget, gpointer data) ret = (int*)g_object_get_data (G_OBJECT (parent), "ret"); *loop = 0; - *ret = (int)data; + *ret = gpointer_to_int (data); } static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data) diff --git a/radiant/eclass_doom3.cpp b/radiant/eclass_doom3.cpp index a1ce4bde..b172a36a 100644 --- a/radiant/eclass_doom3.cpp +++ b/radiant/eclass_doom3.cpp @@ -668,7 +668,7 @@ bool EntityClassDoom3_parse(TextInputStream& inputStream, const char* filename) CopiedString tmp(blockType); if(!EntityClassDoom3_parseBlock(tokeniser, tmp.c_str())) { - globalErrorStream() << GlobalFileSystem().findFile(filename) << filename << ":" << tokeniser.getLine() << ": " << tmp.c_str() << " parse failed, skipping rest of file\n"; + globalErrorStream() << GlobalFileSystem().findFile(filename) << filename << ":" << (unsigned int)tokeniser.getLine() << ": " << tmp.c_str() << " parse failed, skipping rest of file\n"; return false; } } -- 2.39.2