Fix error when building QtShark:

...\capture_opts.h(94) : error C2461: 'remote_host' : constructor syntax missing formal parameters

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40723 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capture_opts.h b/capture_opts.h
index a93ad457cc5d5c0bd594649864e2a566314add64..f8ed3cd1d8096781c3921325b6f2a317f3ea73c7 100644 (file)
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -90,7 +90,7 @@ typedef enum {
 } interface_type;
 
 #ifdef HAVE_PCAP_REMOTE
-struct remote_host {
+struct remote_host_info {
     gchar *remote_host;          /**< Host name or network address for remote capturing */
     gchar *remote_port;          /**< TCP port of remote RPCAP server */
     gint auth_type;              /**< Authentication type */
@@ -103,7 +103,7 @@ struct remote_host {
 
 typedef struct remote_options_tag {
     capture_source src_type;
-    struct remote_host remote_host_opts;
+    struct remote_host_info remote_host_opts;
 #ifdef HAVE_PCAP_SETSAMPLING
     capture_sampling sampling_method;
     int sampling_param;

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 84e0fb6dd1ba1148902a121c99697250cf2fdc02..b2650cdbb82d7aaabfc9b00a679a2484da74b3bc 100644 (file)
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -669,7 +669,7 @@ iftype_combo_box_add (GtkWidget *iftype_cbx)
 {
   GtkTreeModel *model;
   GtkTreeIter iter;
-  struct remote_host *rh;
+  struct remote_host_info *rh;
   gboolean create_new = FALSE;
   gchar *string;
   guint i, pos = REMOTE_HOST_START;
@@ -1502,7 +1502,7 @@ static void
 recent_print_remote_host (gpointer key _U_, gpointer value, gpointer user)
 {
   FILE *rf = user;
-  struct remote_host *ri = value;
+  struct remote_host_info *ri = value;
 
   fprintf (rf, RECENT_KEY_REMOTE_HOST ": %s,%s,%d\n", ri->remote_host, ri->remote_port, ri->auth_type);
 }
@@ -1521,7 +1521,7 @@ capture_remote_combo_add_recent(gchar *s)
 {
   GList *vals = prefs_get_string_list (s);
   GList *valp = vals;
-  struct remote_host *rh;
+  struct remote_host_info *rh;
   gint auth_type;
   char *p;