mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 16:40:54 +00:00
81503d1e44
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/stdio-lock.h to plain stdio-lock.h to follow that convention. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/stdio-lock.h: Move to ... * sysdeps/generic/stdio-lock.h: ...here. (_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H. * sysdeps/nptl/bits/stdio-lock.h: Move to ... * sysdeps/nptl/stdio-lock.h: ...here. (_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H. * include/libio.h: Include <stdio-lock.h> instead of <bits/stdio-lock.h>. * sysdeps/nptl/fork.c: Likewise. * sysdeps/pthread/flockfile.c: Likewise. * sysdeps/pthread/ftrylockfile.c: Likewise. * sysdeps/pthread/funlockfile.c: Likewise.
37 lines
948 B
C
37 lines
948 B
C
#if !defined _ISOMAC && defined _IO_MTSAFE_IO
|
|
# include <stdio-lock.h>
|
|
#endif
|
|
#include <libio/libio.h>
|
|
|
|
#ifndef _ISOMAC
|
|
#ifndef _LIBC_LIBIO_H
|
|
#define _LIBC_LIBIO_H
|
|
|
|
libc_hidden_proto (__overflow)
|
|
libc_hidden_proto (__underflow)
|
|
libc_hidden_proto (__uflow)
|
|
libc_hidden_proto (__woverflow)
|
|
libc_hidden_proto (__wunderflow)
|
|
libc_hidden_proto (__wuflow)
|
|
libc_hidden_proto (_IO_free_backup_area)
|
|
libc_hidden_proto (_IO_free_wbackup_area)
|
|
libc_hidden_proto (_IO_padn)
|
|
libc_hidden_proto (_IO_putc)
|
|
libc_hidden_proto (_IO_sgetn)
|
|
libc_hidden_proto (_IO_vfprintf)
|
|
libc_hidden_proto (_IO_vfscanf)
|
|
|
|
#if defined _IO_MTSAFE_IO && _IO_lock_inexpensive
|
|
# undef _IO_flockfile
|
|
# define _IO_flockfile(_fp) \
|
|
if (((_fp)->_flags & _IO_USER_LOCK) == 0) \
|
|
_IO_lock_lock (*(_fp)->_lock)
|
|
# undef _IO_funlockfile
|
|
# define _IO_funlockfile(_fp) \
|
|
if (((_fp)->_flags & _IO_USER_LOCK) == 0) \
|
|
_IO_lock_unlock (*(_fp)->_lock)
|
|
#endif
|
|
|
|
#endif
|
|
#endif
|