As reported by Michael Speck:

Removed last occurrences of USE_THREADS.

svn path=/trunk/; revision=39775

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 153d3041835a10c3d34422da119622aed302b5e4..44b30dd916a6873f7595931ab3202812e9ee2763 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,10 +436,6 @@ if(ENABLE_PCAP_NG_DEFAULT)
        set(PCAP_NG_DEFAULT 1)
 endif()
 
-if(ENABLE_THREADS)
-       set(USE_THREADS 1)
-endif()
-
 #Platform specific
 if(UNIX)
        set(WS_VAR_IMPORT "extern")

diff --git a/dumpcap.c b/dumpcap.c
index 88699edd20e5315555517dfe0d0aaaa9779aa4db..e7b5980c14da73ab8c63d89beeaa522d283b63ee 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -3748,12 +3748,7 @@ main(int argc, char *argv[])
 #define OPTSTRING_d ""
 #endif
 
-#ifdef USE_THREADS
-#define OPTSTRING_t "t"
-#else
-#define OPTSTRING_t ""
-#endif
-#define OPTSTRING "a:" OPTSTRING_A "b:" OPTSTRING_B "c:" OPTSTRING_d "Df:ghi:" OPTSTRING_I "L" OPTSTRING_m "MnpPq" OPTSTRING_r "Ss:" OPTSTRING_t OPTSTRING_u "vw:y:Z:"
+#define OPTSTRING "a:" OPTSTRING_A "b:" OPTSTRING_B "c:" OPTSTRING_d "Df:ghi:" OPTSTRING_I "L" OPTSTRING_m "MnpPq" OPTSTRING_r "Ss:t" OPTSTRING_u "vw:y:Z:"
 
 #ifdef DEBUG_CHILD_DUMPCAP
     if ((debug_log = ws_fopen("dumpcap_debug_log.tmp","w")) == NULL) {