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/stdio/findfp.c | |
| 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/stdio/findfp.c')
| -rw-r--r-- | newlib/libc/stdio/findfp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 9a9cb037e..a9695ffff 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -47,7 +47,7 @@ _DEFUN(std, (ptr, flags, file, data), ptr->_seek = __sseek; ptr->_close = __sclose; #if !defined(__SINGLE_THREAD__) && !defined(_REENT_SMALL) - __lock_init_recursive (*(_LOCK_RECURSIVE_T *)&ptr->_lock); + __lock_init_recursive (ptr->_lock); /* * #else * lock is already initialized in __sfp @@ -112,7 +112,7 @@ found: fp->_file = -1; /* no file */ fp->_flags = 1; /* reserve this slot; caller sets real flags */ #ifndef __SINGLE_THREAD__ - __lock_init_recursive (*(_LOCK_RECURSIVE_T *)&fp->_lock); + __lock_init_recursive (fp->_lock); #endif __sfp_lock_release (); @@ -143,8 +143,8 @@ _VOID _DEFUN(_cleanup_r, (ptr), struct _reent *ptr) { - /* _CAST_VOID _fwalk(fclose); */ - _CAST_VOID _fwalk (ptr, fflush); /* `cheating' */ + _CAST_VOID _fwalk(ptr, fclose); + /* _CAST_VOID _fwalk (ptr, fflush); */ /* `cheating' */ } #ifndef _REENT_ONLY |