summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nscd/nscd.c14
2 files changed, 5 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 67b7896220..92b567a59f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-22 Ludovic Courtès <ludo@gnu.org>
+
+ * nscd/nscd.c (thread_info_t): Remove typedef.
+ (thread_info): Remove variable.
+
2014-06-21 Allan McRae <allan@archlinux.org>
* NEWS: Mention CVE-2014-4043.
diff --git a/nscd/nscd.c b/nscd/nscd.c
index a4c71e90e2..3dd1135b46 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -57,20 +57,6 @@
#define PACKAGE _libc_intl_domainname
-/* Structure used by main() thread to keep track of the number of
- active threads. Used to limit how many threads it will create
- and under a shutdown condition to wait till all in-progress
- requests have finished before "turning off the lights". */
-
-typedef struct
-{
- int num_active;
- pthread_cond_t thread_exit_cv;
- pthread_mutex_t mutex;
-} thread_info_t;
-
-thread_info_t thread_info;
-
int do_shutdown;
int disabled_passwd;
int disabled_group;