diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2004-06-11 20:37:10 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-06-11 20:37:10 +0000 |
| commit | d0bd3e6f5653a16c8e82c969fb805f4a7d4faf40 (patch) | |
| tree | 32f677032512db74362efe46308b87437c5fc58e /newlib/libc/include/sys/stdio.h | |
| parent | af6b55758bc44c58e70a1baf4061d8a8028f31d6 (diff) | |
| download | cygnal-d0bd3e6f5653a16c8e82c969fb805f4a7d4faf40.tar.gz cygnal-d0bd3e6f5653a16c8e82c969fb805f4a7d4faf40.tar.bz2 cygnal-d0bd3e6f5653a16c8e82c969fb805f4a7d4faf40.zip | |
2004-06-11 Antony King <antony.king@st.com>
* libc/include/sys/_types.h: Include <sys/lock.h> and change
_flock_t to be of type _LOCK_RECURSIVE_T.
* libc/include/sys/reent.h: (_REENT_INIT): Reformat.
(_REENT_INIT_PTR): Ditto. Use memset where appropriate.
(_global_impure_ptr): New declaration.
(_GLOBAL_REENT): Change to be _global_impure_ptr.
* libc/include/sys/stdio.h: Include <sys/lock.h> and
<sys/reent.h>.
(_flockfile)[!_SINGLE_THREAD]: Add code for lock call.
(_funlockfile)[!SINGLE_THREAD]: Ditto.
* libc/reent/impure.c: Set _global_impure_ptr to _impure_ptr.
* libc/stdio/fclose.c: Remove casting of fp lock to
_LOCK_RECURSIVE_T.
* libc/stdio/findfp.c: Ditto.
* libc/stdio/fopen.c: Ditto.
* libc/stdio/freopen.c: Ditto.
* libc/stdio/vfprintf.c: Ditto.
* libc/stdio64/fopen64.c: Ditto.
* libc/stdlib/envlock.c: Add default stubs that use generic
locking code.
* libc/stdlib/mlock.c: Ditto.
Jeff Johnston <jjohnstn@redhat.com>
* libc/sys/linux/sys/_types.h (__flock_mutex_t): New subtype.
(_flock_t): Change to be a struct containing a single member
named mutex which is of type __flock_mutex_t.
Diffstat (limited to 'newlib/libc/include/sys/stdio.h')
| -rw-r--r-- | newlib/libc/include/sys/stdio.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/newlib/libc/include/sys/stdio.h b/newlib/libc/include/sys/stdio.h index 8177322a0..c0cf33893 100644 --- a/newlib/libc/include/sys/stdio.h +++ b/newlib/libc/include/sys/stdio.h @@ -1,14 +1,25 @@ #ifndef _NEWLIB_STDIO_H #define _NEWLIB_STDIO_H +#include <sys/lock.h> +#include <sys/reent.h> + /* Internal locking macros, used to protect stdio functions. In the general case, expand to nothing. */ #if !defined(_flockfile) +#ifndef __SINGLE_THREAD__ +# define _flockfile(fp) __lock_acquire_recursive(fp->_lock) +#else # define _flockfile(fp) #endif +#endif #if !defined(_funlockfile) +#ifndef __SINGLE_THREAD__ +# define _funlockfile(fp) __lock_release_recursive(fp->_lock) +#else # define _funlockfile(fp) #endif +#endif #endif /* _NEWLIB_STDIO_H */ |