Fix build

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

diff --git a/epan/prefs.c b/epan/prefs.c
index 5ee9225049fa6c932284149e655b8201aeffbadc..7ce3afd52fe12911a2c445276ef75d6bdb5b7fdd 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -54,7 +54,7 @@ static module_t *prefs_register_module_or_subtree(module_t *parent,
     const char *name, const char *title, const char *description, gboolean is_subtree,
     void (*apply_cb)(void));
 static struct preference *find_preference(module_t *, const char *);
-static int    set_pref(gchar*, gchar*, void *);
+static prefs_set_pref_e set_pref(gchar*, gchar*, void *);
 static GList *get_string_list(gchar *);
 static gchar *put_string_list(GList *);
 static void   clear_string_list(GList *);
@@ -136,7 +136,7 @@ module_compare_title(gconstpointer p1_arg, gconstpointer p2_arg)
  * the title used in the tab for it in a preferences dialog box, and a
  * routine to call back when we apply the preferences.
  */
-static module_t *
+module_t *
 prefs_register_module(module_t *parent, const char *name, const char *title,
     const char *description, void (*apply_cb)(void))
 {

diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 9cc5daf1061cae5252c48572511363ff6a365a9d..0d4f71e895c3864b9612b8f6e747d3c329c50802 100644 (file)
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -58,10 +58,12 @@
 #ifdef _WIN32
 #include "capture-wpcap.h"
 #endif /* _WIN32 */
+#ifdef HAVE_AIRPCAP
 #include "airpcap.h"
 #include "airpcap_loader.h"
 #include "airpcap_gui_utils.h"
 #endif
+#endif
 
 static void     prefs_main_ok_cb(GtkWidget *, gpointer);
 static void     prefs_main_apply_cb(GtkWidget *, gpointer);