This patch fixes the following two errors that appear when
configure is run with "--without-plugins" cc1: warnings being treated as errors about_dlg.c: In function ‘about_wireshark_cb’: about_dlg.c:426: warning: unused variable ‘plugins_page’ make[2]: *** [about_dlg.o] Error 1 editcap.c: In function ‘main’: editcap.c:663: error: ‘check_ts’ undeclared (first use in this function) editcap.c:663: error: (Each undeclared identifier is reported only once editcap.c:663: error: for each function it appears in.) make[2]: *** [editcap.o] Error 1 svn path=/trunk/; revision=22761
This commit is contained in:
parent
1a8fb7a459
commit
27efb95042
|
@ -385,9 +385,9 @@ int main(int argc, char *argv[])
|
|||
int split_packet_count = 0;
|
||||
int written_count = 0;
|
||||
char *filename;
|
||||
gboolean check_ts;
|
||||
#ifdef HAVE_PLUGINS
|
||||
char* init_progfile_dir_error;
|
||||
gboolean check_ts;
|
||||
|
||||
/* Register wiretap plugins */
|
||||
if ((init_progfile_dir_error = init_progfile_dir(argv[0]))) {
|
||||
|
|
|
@ -422,8 +422,12 @@ void
|
|||
about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ )
|
||||
{
|
||||
GtkWidget *main_vb, *main_nb, *bbox, *ok_btn;
|
||||
GtkWidget *page_lb, *about_page, *folders_page;
|
||||
|
||||
#ifdef HAVE_PLUGINS
|
||||
GtkWidget *plugins_page;
|
||||
#endif
|
||||
|
||||
GtkWidget *page_lb, *about_page, *folders_page, *plugins_page;
|
||||
#if GTK_MAJOR_VERSION >= 2 || GTK_MINOR_VERSION >= 3
|
||||
GtkWidget *authors_page, *license_page;
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue