Fix compilation on non-windows platforms defining USE_THREADS.
authortuexen <tuexen@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 15 Jul 2011 14:31:27 +0000 (14:31 +0000)
committertuexen <tuexen@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 15 Jul 2011 14:31:27 +0000 (14:31 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38044 f5534014-38df-0310-8fa8-9805f1628bb7

dumpcap.c
gtk/prefs_taps.c

index ec8389034c8fd34e210564c79d9cb9cdadc1df38..e464d28f53e86ac61cf03ba64b623f4fa9c9f2d6 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -1637,6 +1637,7 @@ static void *cap_pipe_read(void *arg)
 }
 #endif /* USE_THREADS */
 
+#if !defined(USE_THREADS) || defined(MUST_DO_SELECT)
 /* Provide select() functionality for a single file descriptor
  * on UNIX/POSIX. Windows uses cap_pipe_read via a thread.
  *
@@ -1656,6 +1657,7 @@ cap_pipe_select(int pipe_fd)
 
     return select(pipe_fd+1, &rfds, NULL, NULL, &timeout);
 }
+#endif
 
 
 /* Mimic pcap_open_live() for pipe captures
index 01813460255847b4d2c3c31fd55f95de2db87504..8f7cc4991db21eedccddb30594ef261ac71dad85 100644 (file)
@@ -124,7 +124,9 @@ stats_prefs_fetch(GtkWidget *w _U_)
 void
 stats_prefs_apply(GtkWidget *w _U_)
 {
+#if defined(_WIN32) || ! defined USE_THREADS
         reset_tap_update_timer();
+#endif
 }
 
 void