busybox/uClibc
1
0
Fork 0
mirror of https://git.busybox.net/uClibc synced 2025-05-08 23:02:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into prelink

Browse Source 
* origin/master:
  libc: add missing lock initialization in vswprintf
  libubacktrace: fix makefile clean target

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
This commit is contained in:
Carmelo Amoroso 2011-07-01 09:48:01 +02:00
commit 1c1391e6e5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/stdio/vswprintf.c
View File

@ -39,6 +39,11 @@ int vswprintf(wchar_t *__restrict buf, size_t size,
__INIT_MBSTATE(&(f.__state)); __INIT_MBSTATE(&(f.__state));
#endif /* __STDIO_MBSTATE */ #endif /* __STDIO_MBSTATE */
#ifdef __UCLIBC_HAS_THREADS__
f.__user_locking = 1; /* Set user locking. */
STDIO_INIT_MUTEX(f.__lock);
#endif /* __UCLIBC_HAS_THREADS__ */
f.__nextopen = NULL; f.__nextopen = NULL;
if (size > ((SIZE_MAX - (size_t) buf)/sizeof(wchar_t))) { if (size > ((SIZE_MAX - (size_t) buf)/sizeof(wchar_t))) {

3
libubacktrace/Makefile.in
View File

@ -71,5 +71,4 @@ $(top_builddir)lib/libubacktrace.a: $(libubacktrace-a-y)
$(do_ar) $(do_ar)
CLEAN_libubacktrace: CLEAN_libubacktrace:
$(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a) \ $(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a)
$(addprefix $(libubacktrace_ARCH_OUT)/*., o os oS a)