gcc 4 doesn't like my macro for getting the interface description: it says there's an invalid lvalue in it. I don't see what's wrong with it, but replace the macro with a function. Also: don't include the .xpm files in gtk/main.c if we're building without PCAP (as they're not used in that configuration).

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

1 files changed, 11 insertions, 1 deletions

diff --git a/capture_ui_utils.h b/capture_ui_utils.h
index 637c6ccc28..8370b31d4a 100644
--- a/capture_ui_utils.h
+++ b/capture_ui_utils.h
@@ -25,6 +25,8 @@
 #ifndef __CAPTURE_UI_UTILS_H__
 #define __CAPTURE_UI_UTILS_H__
 
+#include "capture_opts.h"
+
 /** @file
  *  GList of available capture interfaces.
  */
@@ -74,6 +76,14 @@ const char *get_if_name(const char *if_text);
  *
  * @return The descriptive name (must be g_free'd later)
  */
-char * build_capture_combo_name(GList *if_list, gchar *if_name);
+char *build_capture_combo_name(GList *if_list, gchar *if_name);
+
+/** Return the interface description (after setting it if not already set)
+ *
+ * @param capture_opts The capture_options structure that contains the used interface
+ *
+ * @return A pointer to capture_ops->iface_descr
+ */
+const char *get_iface_description(capture_options *capture_opts);
 
 #endif