From 612dcc3c6b9ccf498b65fe9504e16e62181bdd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
Date: Wed, 9 Nov 2011 20:45:06 +0000
Subject: [PATCH] As reported by Michael Speck: Removed last occurrences of
 USE_THREADS.

svn path=/trunk/; revision=39775
---
 CMakeLists.txt | 4 ----
 dumpcap.c      | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 153d304183..44b30dd916 100644
--- 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 88699edd20..e7b5980c14 100644
--- 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) {