resolve merge

1 files changed, 0 insertions, 42 deletions

diff --git a/libpthread/linuxthreads.old/lockfile.c b/libpthread/linuxthreads.old/lockfile.c
deleted file mode 100644
index de834c476..000000000
--- a/libpthread/linuxthreads.old/lockfile.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* lockfile - Handle locking and unlocking of stream.
-   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <stdio.h>
-#include <pthread.h>
-
-extern __typeof(pthread_mutexattr_init) __pthread_mutexattr_init attribute_hidden;
-extern __typeof(pthread_mutexattr_settype) __pthread_mutexattr_settype attribute_hidden;
-extern __typeof(pthread_mutexattr_destroy) __pthread_mutexattr_destroy attribute_hidden;
-
-/* Note: glibc puts flockfile, funlockfile, and ftrylockfile in both
- * libc and libpthread.  In uClibc, they are now in libc only.  */
-
-void __fresetlockfiles (void);
-void __fresetlockfiles (void)
-{
-  FILE *fp;
-  pthread_mutexattr_t attr;
-
-  __pthread_mutexattr_init(&attr);
-  __pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-
-  for (fp = _stdio_openlist; fp != NULL; fp = fp->__nextopen)
-    __pthread_mutex_init(&fp->__lock, &attr);
-
-  __pthread_mutexattr_destroy(&attr);
-}