Reverted r29471. It breaks building kernel code including this heaader in
debug mode with gcc 2.95.3. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29547 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
c76e8d36fb
commit
3967230d7f
@ -174,10 +174,10 @@ extern int _IO_feof_unlocked(_IO_FILE *stream);
|
||||
extern int _IO_ferror(_IO_FILE *stream);
|
||||
extern int _IO_ferror_unlocked(_IO_FILE *stream);
|
||||
extern int _IO_putc(int c, _IO_FILE *stream);
|
||||
static int _IO_putc_unlocked(int c, _IO_FILE *stream);
|
||||
extern int _IO_putc_unlocked(int c, _IO_FILE *stream);
|
||||
extern int _IO_getc(_IO_FILE *stream);
|
||||
static int _IO_getc_unlocked(_IO_FILE *stream);
|
||||
static int _IO_peekc_unlocked(_IO_FILE *stream);
|
||||
extern int _IO_getc_unlocked(_IO_FILE *stream);
|
||||
extern int _IO_peekc_unlocked(_IO_FILE *stream);
|
||||
|
||||
extern int __underflow(_IO_FILE *stream);
|
||||
extern int __uflow(_IO_FILE *stream);
|
||||
@ -214,8 +214,13 @@ extern _IO_fpos64_t _IO_seekpos(_IO_FILE *, _IO_fpos64_t, int);
|
||||
|
||||
extern void _IO_free_backup_area(_IO_FILE *);
|
||||
|
||||
#ifdef __cplusplus
|
||||
# define __INLINE inline
|
||||
#else
|
||||
# define __INLINE extern __inline
|
||||
#endif
|
||||
|
||||
static inline int
|
||||
__INLINE int
|
||||
_IO_getc_unlocked(_IO_FILE *stream)
|
||||
{
|
||||
if (stream->_IO_read_ptr >= stream->_IO_read_end)
|
||||
@ -225,18 +230,17 @@ _IO_getc_unlocked(_IO_FILE *stream)
|
||||
}
|
||||
|
||||
|
||||
static inline int
|
||||
__INLINE int
|
||||
_IO_peekc_unlocked(_IO_FILE *stream)
|
||||
{
|
||||
if (stream->_IO_read_ptr >= stream->_IO_read_end
|
||||
&& __underflow(stream) == EOF)
|
||||
if (stream->_IO_read_ptr >= stream->_IO_read_end && __underflow(stream) == EOF)
|
||||
return EOF;
|
||||
|
||||
return *(unsigned char *)stream->_IO_read_ptr;
|
||||
}
|
||||
|
||||
|
||||
static inline int
|
||||
__INLINE int
|
||||
_IO_putc_unlocked(int c, _IO_FILE *stream)
|
||||
{
|
||||
if (stream->_IO_write_ptr >= stream->_IO_write_end)
|
||||
@ -245,6 +249,8 @@ _IO_putc_unlocked(int c, _IO_FILE *stream)
|
||||
return (unsigned char)(*stream->_IO_write_ptr++ = c);
|
||||
}
|
||||
|
||||
#undef __INLINE
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user