See whether the Leopard x86 buildbot is upset because of the name

if_capabilities_t - it doesn't fail on Snow Leopard, even if I undefine
HAVE_PCAP_CREATE, and doesn't fail on the Leopard PPC buildbot, either.

svn path=/trunk/; revision=32799

10 files changed, 18 insertions, 18 deletions

diff --git a/capture-pcap-util.c b/capture-pcap-util.c
index 1850b10acd..55378d7b83 100644
--- a/capture-pcap-util.c
+++ b/capture-pcap-util.c
@@ -448,7 +448,7 @@ free_linktype_cb(gpointer data, gpointer user_data _U_)
 }
 
 void
-free_if_capabilities(if_capabilities_t *caps)
+free_if_capabilities(if_caps_t *caps)
 {
 	g_list_foreach(caps->data_link_types, free_linktype_cb, NULL);
 	g_list_free(caps->data_link_types);
diff --git a/capture_ifinfo.c b/capture_ifinfo.c
index e9fc5347a0..b5b8889599 100644
--- a/capture_ifinfo.c
+++ b/capture_ifinfo.c
@@ -155,11 +155,11 @@ capture_interface_list(int *err, char **err_str)
 
 /* XXX - We parse simple text output to get our interface list.  Should
  * we use "real" data serialization instead, e.g. via XML? */
-if_capabilities_t *
+if_caps_t *
 capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode,
                             char **err_str)
 {
-    if_capabilities_t *caps;
+    if_caps_t *caps;
     GList              *linktype_list = NULL;
     int                 err, i;
     gchar              *msg;
diff --git a/capture_ifinfo.h b/capture_ifinfo.h
index e0cec1db7f..ba97650744 100644
--- a/capture_ifinfo.h
+++ b/capture_ifinfo.h
@@ -74,7 +74,7 @@ void free_interface_list(GList *if_list);
 typedef struct {
 	gboolean	can_set_rfmon;	/* TRUE if can be put into monitor mode */
 	GList		*data_link_types;	/* GList of data_link_info_t's */
-} if_capabilities_t;
+} if_caps_t;
 
 /*
  * Information about data link types.
@@ -88,11 +88,11 @@ typedef struct {
 /**
  * Fetch the linktype list for the specified interface from a child process.
  */
-extern if_capabilities_t *
+extern if_caps_t *
 capture_get_if_capabilities(const char *devname, gboolean monitor_mode,
                             char **err_str);
 
-void free_if_capabilities(if_capabilities_t *caps);
+void free_if_capabilities(if_caps_t *caps);
 
 #endif /* HAVE_LIBPCAP */
 
diff --git a/capture_opts.c b/capture_opts.c
index 23297b60eb..e42ebf842d 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -547,7 +547,7 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
 }
 
 void
-capture_opts_print_if_capabilities(if_capabilities_t *caps,
+capture_opts_print_if_capabilities(if_caps_t *caps,
                                    gboolean monitor_mode)
 {
     GList *lt_entry;
diff --git a/capture_opts.h b/capture_opts.h
index 34709fce04..4023dad9f2 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -176,7 +176,7 @@ capture_opts_log(const char *log_domain, GLogLevelFlags log_level, capture_optio
 
 /* print interface capabilities, including link layer types */
 extern void
-capture_opts_print_if_capabilities(if_capabilities_t *caps,
+capture_opts_print_if_capabilities(if_caps_t *caps,
                                    gboolean monitor_mode);
 
 /* print list of interfaces */
diff --git a/dumpcap.c b/dumpcap.c
index ef865b97e7..c5af5cc128 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -502,14 +502,14 @@ create_data_link_info(int dlt)
     return data_link_info;
 }
 
-static if_capabilities_t *
+static if_caps_t *
 get_if_capabilities(const char *devname, gboolean monitor_mode
 #ifndef HAVE_PCAP_CREATE
 	_U_
 #endif
 , char **err_str)
 {
-    if_capabilities_t *caps;
+    if_caps_t *caps;
     char errbuf[PCAP_ERRBUF_SIZE];
     pcap_t *pch;
 #ifdef HAVE_PCAP_CREATE
@@ -741,7 +741,7 @@ print_machine_readable_interfaces(GList *if_list)
  * you MUST update capture_ifinfo.c:capture_get_if_capabilities() accordingly!
  */
 static void
-print_machine_readable_if_capabilities(if_capabilities_t *caps)
+print_machine_readable_if_capabilities(if_caps_t *caps)
 {
     GList *lt_entry;
     data_link_info_t *data_link_info;
@@ -3472,7 +3472,7 @@ main(int argc, char *argv[])
     exit_main(0);
   } else if (list_link_layer_types) {
     /* Get the list of link-layer types for the capture device. */
-    if_capabilities_t *caps;
+    if_caps_t *caps;
     gchar *err_str;
 
     caps = get_if_capabilities(global_capture_opts.iface,
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 405cd173e1..4405dd148c 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -252,7 +252,7 @@ set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry)
   GList *if_list;
   GList *if_entry;
   if_info_t *if_info;
-  if_capabilities_t *caps;
+  if_caps_t *caps;
   int err;
   GtkWidget *lt_menu, *lt_menu_item;
   GList *lt_entry;
diff --git a/gtk/main.c b/gtk/main.c
index b5c82a7c5e..c48c5fe394 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2741,7 +2741,7 @@ main(int argc, char *argv[])
 
   if (list_link_layer_types) {
     /* Get the list of link-layer types for the capture device. */
-    if_capabilities_t *caps;
+    if_caps_t *caps;
 
     caps = capture_get_if_capabilities(global_capture_opts.iface,
                                        global_capture_opts.monitor_mode,
diff --git a/gtk/prefs_capture.c b/gtk/prefs_capture.c
index 6debfe3ae9..8114a8113d 100644
--- a/gtk/prefs_capture.c
+++ b/gtk/prefs_capture.c
@@ -598,7 +598,7 @@ ifopts_edit_destroy_cb(GtkWidget *win, gpointer data _U_)
 static gint
 ifopts_description_to_val (const char *if_name, const char *descr) 
 {
-	if_capabilities_t *caps;
+	if_caps_t *caps;
 	int dlt = -1;
 
 	caps = capture_get_if_capabilities(if_name, FALSE, NULL);
@@ -640,7 +640,7 @@ ifopts_edit_ifsel_cb(GtkTreeSelection	*selection _U_,
 	gchar              *desc, *comment, *text;
 	gchar              *if_name, *linktype;
 	gboolean            hide;
-	if_capabilities_t *caps;
+	if_caps_t *caps;
 	gint                selected = 0;
 
 	/* Get list_store data for currently selected interface */
@@ -841,7 +841,7 @@ ifopts_options_add(GtkListStore *list_store, if_info_t *if_info)
 	gchar	*desc;
 	gchar	*pr_descr;
 	gchar	*text[] = { NULL, NULL, NULL, NULL };
-	if_capabilities_t *caps;
+	if_caps_t *caps;
 	gint     linktype;
 	gboolean hide;
 	GtkTreeIter  iter;
diff --git a/tshark.c b/tshark.c
index 46d211377d..37f544b754 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1640,7 +1640,7 @@ main(int argc, char *argv[])
     /* if requested, list the link layer types and exit */
     if (list_link_layer_types) {
         /* Get the list of link-layer types for the capture device. */
-        if_capabilities_t *caps;
+        if_caps_t *caps;
 
         caps = capture_get_if_capabilities(global_capture_opts.iface,
                                            global_capture_opts.monitor_mode,