uClibc_stdio.h: change the guard used to include stdio-lock.h

My intention was to get rid of uClibc_mutex.h completely on install, but it
introduces other dependencies. It affects anyway only the installed case.

Note: since NPTL was added, the FILE structure changes between the build
and the installed version. I wanted to fix this by the earlier commit.
Reverting the behaviour to IMHO a wrong one.

While there, remove libc-lock.h and stdio-lock.h on install (even though
glibc has them -wrongly- installed).

Reported-by: Tony Wu <tung7970@gmail.com>
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
This commit is contained in:
Peter S. Mazinger 2011-03-23 11:19:29 +01:00 committed by Bernhard Reutner-Fischer
parent 8f1ba5cd4f
commit 39e91246bd
2 changed files with 3 additions and 1 deletions

View File

@ -226,6 +226,8 @@ HEADERS_RM- := \
bits/kernel_sigaction.h \
bits/kernel_stat.h \
bits/kernel_types.h \
bits/libc-lock.h \
bits/stdio-lock.h \
bits/syscalls.h \
bits/syscalls-common.h \
bits/uClibc_fpmax.h \

View File

@ -205,7 +205,7 @@ typedef _IO_cookie_io_functions_t cookie_io_functions_t;
/**********************************************************************/
#if defined __UCLIBC_HAS_THREADS__ && !defined __UCLIBC_IO_MUTEX
# ifdef __UCLIBC_HAS_THREADS_NATIVE__
# ifdef __USE_STDIO_FUTEXES__
# include <bits/stdio-lock.h>
# define __UCLIBC_IO_MUTEX(M) _IO_lock_t M
# else