[git commit] uClibc_stdio.h: change the guard used to include stdio-lock.h
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 15 12:00:31 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=39e91246bd72e684a1533d11928af3875a165e07
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
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 at gmail.com>
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
Makefile.in | 2 ++
libc/sysdeps/linux/common/bits/uClibc_stdio.h | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 65b3160..8cc7a01 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 \
diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
index c0c3e56..06000a8 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
@@ -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
More information about the uClibc-cvs
mailing list