Pointer <--> int converions cause warnings on ia64.

Modified a patch originally contained in the SuSE distro
to do the conversions via glib macros.

svn path=/trunk/; revision=7330

5 files changed, 13 insertions, 12 deletions

diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c
index dc3a76a083..2c43623ba2 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.c
@@ -1,7 +1,7 @@
 /* column_prefs.c
  * Dialog box for column preferences
  *
- * $Id: column_prefs.c,v 1.15 2002/11/09 20:52:39 oabad Exp $
+ * $Id: column_prefs.c,v 1.16 2003/03/10 02:06:33 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -239,7 +239,7 @@ column_prefs_show() {
   for (i = 0; i < NUM_COL_FMTS; i++) {
     mitem = gtk_menu_item_new_with_label(col_format_desc(i));
     gtk_menu_append(GTK_MENU(menu), mitem);
-    SIGNAL_CONNECT(mitem, "activate", column_menu_changed_cb, (gpointer) i);
+    SIGNAL_CONNECT(mitem, "activate", column_menu_changed_cb, GINT_TO_POINTER(i));
     gtk_widget_show(mitem);
   }
   gtk_option_menu_set_menu(GTK_OPTION_MENU(fmt_m), menu);
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 12abfb2b36..6b6a11ef82 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: dfilter_expr_dlg.c,v 1.32 2003/01/31 03:17:54 guy Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.33 2003/03/10 02:06:33 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1333,7 +1333,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
            under its parent protocol. */
 #if GTK_MAJOR_VERSION < 2
         protocol_node = g_hash_table_lookup(proto_array,
-                                            (gpointer)proto_registrar_get_parent(i));
+                                            GINT_TO_POINTER(proto_registrar_get_parent(i)));
         item_node = gtk_ctree_insert_node(GTK_CTREE(tree),
                                           protocol_node, NULL,
                                           &hfinfo->name, 5,
diff --git a/packet-dcerpc.c b/packet-dcerpc.c
index d3fcb7752f..3be460b1ba 100644
--- a/packet-dcerpc.c
+++ b/packet-dcerpc.c
@@ -2,7 +2,7 @@
  * Routines for DCERPC packet disassembly
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc.c,v 1.111 2003/03/05 07:17:50 guy Exp $
+ * $Id: packet-dcerpc.c,v 1.112 2003/03/10 02:06:31 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -571,7 +571,8 @@ static guint
 dcerpc_bind_hash (gconstpointer k)
 {
     const dcerpc_bind_key *key = (const dcerpc_bind_key *)k;
-    return ((guint)key->conv) + key->ctx_id + key->smb_fid;
+    return GPOINTER_TO_UINT(key->conv) + key->ctx_id + key->smb_fid;
+
 }
 
 /*
diff --git a/packet-rpc.c b/packet-rpc.c
index 6523cd63a3..3b38f5297e 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
  * Routines for rpc dissection
  * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
  *
- * $Id: packet-rpc.c,v 1.114 2002/12/31 07:49:14 guy Exp $
+ * $Id: packet-rpc.c,v 1.115 2003/03/10 02:06:31 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -433,7 +433,7 @@ rpc_call_hash(gconstpointer k)
 {
 	const rpc_call_info_key* key = (const rpc_call_info_key*) k;
 
-	return key->xid + (guint32)(key->conversation);
+	return key->xid + GPOINTER_TO_UINT(key->conversation);
 }
 
 
diff --git a/packet-ssl.c b/packet-ssl.c
index 2eeb74b9ca..b144e5c68c 100644
--- a/packet-ssl.c
+++ b/packet-ssl.c
@@ -2,7 +2,7 @@
  * Routines for ssl dissection
  * Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org>
  *
- * $Id: packet-ssl.c,v 1.25 2003/01/27 19:50:05 guy Exp $
+ * $Id: packet-ssl.c,v 1.26 2003/03/10 02:06:31 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -611,7 +611,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     conv_data = conversation_get_proto_data(conversation, proto_ssl);
     if (conv_data != NULL)
     {
-        conv_version = (guint)conv_data;
+        conv_version = GPOINTER_TO_UINT(conv_data);
     }
 
     /* Initialize the protocol column; we'll set it later when we
@@ -743,7 +743,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
          * this conversation, do so. */
         if (conv_data == NULL)
         {
-            conv_data = (void *)conv_version;
+            conv_data = GINT_TO_POINTER(conv_version);
             conversation_add_proto_data(conversation, proto_ssl, conv_data);
         }
 
@@ -2211,7 +2211,7 @@ ssl_set_conv_version(packet_info *pinfo, guint version)
         /* get rid of the current data */
         conversation_delete_proto_data(conversation, proto_ssl);
     }
-    conversation_add_proto_data(conversation, proto_ssl, (void *)version);
+    conversation_add_proto_data(conversation, proto_ssl, GINT_TO_POINTER(version));
 }
 
 static int