[git commit master] nptl: remove unneeded libc-lock.h include

Timo Teräs timo.teras at iki.fi
Fri Apr 23 14:31:55 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=2520b17c292af534decee7fba76865520ea9727c
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

I semi-accidentally added include for libc-lock.h because the intention
was to use locking macroes from there. However, we ended up using using
the weak alias stuff. This is additionally good since now this can result
in compile errors like:

In file included from /toolchain/include/bits/uClibc_mutex.h:16,
                 from /toolchain/include/bits/uClibc_stdio.h:107,
                 from /toolchain/include/stdio.h:72,
                 from /work/freetype-2.3.11/include/freetype/config/ftstdlib.h:100,
                 from ./builds/unix/ftconfig.h:43,
                 from builds/unix/ftsystem.c:21:
/toolchain/include/bits/libc-lock.h:309: error: expected '=', ',',
';', 'asm' or '__attribute__' before 'void'

Remove the unneeded include causing breakage.

Reported-by: Kevin Day <thekevinday at gmail.com>
Signed-off-by: Timo Teräs <timo.teras at iki.fi>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libc/sysdeps/linux/common/bits/uClibc_mutex.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/libc/sysdeps/linux/common/bits/uClibc_mutex.h b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
index 02bcc72..6d004bb 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_mutex.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
@@ -13,7 +13,6 @@
 #ifdef __UCLIBC_HAS_THREADS__
 
 #include <pthread.h>
-#include <bits/libc-lock.h>
 #include <bits/uClibc_pthread.h>
 
 #define __uclibc_maybe_call(FUNC, ARGS) \
-- 
1.6.3.3



More information about the uClibc-cvs mailing list