From 9080cc153cc2b09881c3245becbd68534db18d7c Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 17 Apr 2011 16:53:54 -0400 Subject: clean up handling of thread/nothread mode, locking --- src/stdio/flockfile.c | 5 +---- src/stdio/ftrylockfile.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/stdio') diff --git a/src/stdio/flockfile.c b/src/stdio/flockfile.c index 440a36a9..0d4c92c2 100644 --- a/src/stdio/flockfile.c +++ b/src/stdio/flockfile.c @@ -3,9 +3,6 @@ void flockfile(FILE *f) { - if (!libc.lockfile) { - pthread_self(); - libc.lockfile = __lockfile; - } + if (!libc.threaded) pthread_self(); __lockfile(f); } diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c index 67f4b6a0..0b0e44aa 100644 --- a/src/stdio/ftrylockfile.c +++ b/src/stdio/ftrylockfile.c @@ -4,7 +4,6 @@ int ftrylockfile(FILE *f) { int tid = pthread_self()->tid; - if (!libc.lockfile) libc.lockfile = __lockfile; if (f->lock == tid) { if (f->lockcount == INT_MAX) return -1; -- cgit v1.2.1