diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-22 18:56:20 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-22 18:56:20 +0000 |
| commit | 8043464c24e4f80da76b870ca8af035d51010e2c (patch) | |
| tree | 1db43eda4da23d1b01afe37bb2167a1b97c3ac6f /capture_ui_utils.h | |
| parent | 2f77efce7da0a079c38609e7bd24cc69937863b1 (diff) | |
| download | wireshark-8043464c24e4f80da76b870ca8af035d51010e2c.tar.gz wireshark-8043464c24e4f80da76b870ca8af035d51010e2c.tar.bz2 wireshark-8043464c24e4f80da76b870ca8af035d51010e2c.zip | |
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
Diffstat (limited to 'capture_ui_utils.h')
| -rw-r--r-- | capture_ui_utils.h | 12 |
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 |