aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pcap-util.c10
-rw-r--r--prefs.c4
-rw-r--r--reassemble.c4
3 files changed, 11 insertions, 7 deletions
diff --git a/pcap-util.c b/pcap-util.c
index 044348137a..ab372deb24 100644
--- a/pcap-util.c
+++ b/pcap-util.c
@@ -1,7 +1,7 @@
/* pcap-util.c
* Utility routines for packet capture
*
- * $Id: pcap-util.c,v 1.3 2001/11/09 08:16:24 guy Exp $
+ * $Id: pcap-util.c,v 1.4 2002/03/31 21:05:11 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -75,7 +75,11 @@
* rest-of-the-universe libpcap.
*/
int
-get_pcap_linktype(pcap_t *pch, char *devname)
+get_pcap_linktype(pcap_t *pch, char *devname
+#ifndef AIX
+ _U_
+#endif
+)
{
int linktype;
#ifdef AIX
@@ -431,7 +435,7 @@ get_interface_list(int *err, char *err_str) {
#endif
static void
-free_if_cb(gpointer data, gpointer user_data)
+free_if_cb(gpointer data, gpointer user_data _U_)
{
g_free(data);
}
diff --git a/prefs.c b/prefs.c
index c53092da5e..586193962e 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.80 2002/01/21 07:36:48 guy Exp $
+ * $Id: prefs.c,v 1.81 2002/03/31 21:05:11 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -212,7 +212,7 @@ prefs_module_foreach(module_cb callback, gpointer user_data)
}
static void
-call_apply_cb(gpointer data, gpointer user_data)
+call_apply_cb(gpointer data, gpointer user_data _U_)
{
module_t *module = data;
diff --git a/reassemble.c b/reassemble.c
index b043c524e7..9d8175dbc2 100644
--- a/reassemble.c
+++ b/reassemble.c
@@ -1,7 +1,7 @@
/* reassemble.c
* Routines for {fragment,segment} reassembly
*
- * $Id: reassemble.c,v 1.9 2002/02/03 23:28:38 guy Exp $
+ * $Id: reassemble.c,v 1.10 2002/03/31 21:05:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -102,7 +102,7 @@ fragment_hash(gconstpointer k)
* (The actual key and value structures get freed by "reassemble_init()".)
*/
static gboolean
-free_all_fragments(gpointer key_arg, gpointer value, gpointer user_data)
+free_all_fragments(gpointer key_arg, gpointer value, gpointer user_data _U_)
{
fragment_key *key = key_arg;
fragment_data *fd_head;