diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-23 11:19:29 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:31 +0200 |
| commit | 39e91246bd72e684a1533d11928af3875a165e07 (patch) | |
| tree | 225292060ea631a1e14f4ce9430cc4e09ca1a473 | |
| parent | 8f1ba5cd4ff6dc1dcf682796ed41d1880aa8d19c (diff) | |
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>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | 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 65b316001..8cc7a01a1 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 c0c3e561c..06000a85c 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 |