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).

svn path=/trunk/; revision=22588

1 files changed, 2 insertions, 10 deletions

diff --git a/capture_opts.h b/capture_opts.h
index fc0c92a16c..2f96886d90 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -53,7 +53,8 @@ typedef struct capture_options_tag {
 				      *< set this field because doing so
 				      *< requires too many dependencies.
 				      *< Readers of this field should use
-				      *< GET_IFACE_DESCR to access it. */
+				      *< get_iface_description() from
+				      *< "capture_ui_utils.h" to access it. */
 
 #ifdef _WIN32
     int      buffer_size;           /**< the capture buffer size (MB) */
@@ -105,15 +106,6 @@ typedef struct capture_options_tag {
     gboolean output_to_pipe;        /**< save_file is a pipe (named or stdout) */
 } capture_options;
 
-/*  Get iface_descr (and set it if it's not set already).
- *  It is assumed the caller includes capture_ui_utils.h (ugh, but what else
- *  can we do?)
- */
-#define GET_IFACE_DESCR(capture_opts) capture_opts->iface_descr ? \
-				      capture_opts->iface_descr : \
-				      capture_opts->iface_descr = get_interface_descriptive_name(capture_opts->iface)
-
-
 /* initialize the capture_options with some reasonable values */
 extern void
 capture_opts_init(capture_options *capture_opts, void *cfile);