diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2014-12-11 19:53:32 +0300 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2014-12-11 19:53:32 +0300 |
| commit | 6f34876e5e81e768cc34547bedee0da2c31d8aae (patch) | |
| tree | 459a47fa4a1ebbafc8581838d4f9ee04b692de1f /newlib/libc/include/stdio_ext.h | |
| parent | 070d1cee7d0e5616ca93ec02219e18816c79c640 (diff) | |
* libc/include/stdio_ext.h: Rename __fwriteable to __fwritable.
[!__GNUC__]: Declare real functions for the macros, and make
the macros conditional on !__cplusplus.
* libc/stdio/Makefile.am (ELIX_4_SOURCES): Add stdio_ext.c.
(CHEWOUT_FILES): Add stdio_ext.def.
* libc/stdio/Makefile.in: Regenerate.
* libc/stdio/stdio.tex: Include stdio_ext.def.
* libc/stdio/stdio_ext.c: New file.
Diffstat (limited to 'newlib/libc/include/stdio_ext.h')
| -rw-r--r-- | newlib/libc/include/stdio_ext.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/newlib/libc/include/stdio_ext.h b/newlib/libc/include/stdio_ext.h index 0c9ddadaf..4b6f8ae36 100644 --- a/newlib/libc/include/stdio_ext.h +++ b/newlib/libc/include/stdio_ext.h @@ -38,7 +38,7 @@ _ELIDABLE_INLINE int __freadable (FILE *__fp) { return (__fp->_flags & (__SRD | __SRW)) != 0; } _ELIDABLE_INLINE int -__fwriteable (FILE *__fp) { return (__fp->_flags & (__SWR | __SRW)) != 0; } +__fwritable (FILE *__fp) { return (__fp->_flags & (__SWR | __SRW)) != 0; } _ELIDABLE_INLINE int __flbf (FILE *__fp) { return (__fp->_flags & __SLBF) != 0; } @@ -48,14 +48,26 @@ __fpending (FILE *__fp) { return __fp->_p - __fp->_bf._base; } #else +size_t _EXFUN(__fbufsize,(FILE *)); +int _EXFUN(__freading,(FILE *)); +int _EXFUN(__fwriting,(FILE *)); +int _EXFUN(__freadable,(FILE *)); +int _EXFUN(__fwritable,(FILE *)); +int _EXFUN(__flbf,(FILE *)); +size_t _EXFUN(__fpending,(FILE *)); + +#ifndef __cplusplus + #define __fbufsize(__fp) ((size_t) (__fp)->_bf._size) #define __freading(__fp) (((__fp)->_flags & __SRD) != 0) #define __fwriting(__fp) (((__fp)->_flags & __SWR) != 0) #define __freadable(__fp) (((__fp)->_flags & (__SRD | __SRW)) != 0) -#define __fwriteable(__fp) (((__fp)->_flags & (__SWR | __SRW)) != 0) +#define __fwritable(__fp) (((__fp)->_flags & (__SWR | __SRW)) != 0) #define __flbf(__fp) (((__fp)->_flags & __SLBF) != 0) #define __fpending(__fp) ((size_t) ((__fp)->_p - (__fp)->_bf._base)) +#endif /* __cplusplus */ + #endif /* __GNUC__ */ _END_STD_C |