Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

To avoid problems of reversed meaning of "extern inline" in

Browse Source 
GCC 4.3 and above (conforming to the standard when compiled with -std=c99
or -std=gnu99), define the inline functions as "static inline". I've had
another patch that maintains the previous behavior, but as titer pointed
out, we have no code in our repo that overrides the inlined functions
with their own version, and doing so for any other code would be
problematic, since for example Linux libio.h #defines these as macros.
In any case, I don't really know what I am doing, so please correct me
if I did something stupid! :-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29471 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-03-11 11:21:52 +00:00
parent b302c77c1b
commit 105c63e8cd
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
headers/posix/libio.h
View File

@ -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);
extern int _IO_putc_unlocked(int c, _IO_FILE *stream);
static int _IO_putc_unlocked(int c, _IO_FILE *stream);
extern int _IO_getc(_IO_FILE *stream);
extern int _IO_getc_unlocked(_IO_FILE *stream);
extern int _IO_peekc_unlocked(_IO_FILE *stream);
static int _IO_getc_unlocked(_IO_FILE *stream);
static int _IO_peekc_unlocked(_IO_FILE *stream);
extern int __underflow(_IO_FILE *stream);
extern int __uflow(_IO_FILE *stream);
@ -214,13 +214,8 @@ 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
__INLINE int
static inline int
_IO_getc_unlocked(_IO_FILE *stream)
{
if (stream->_IO_read_ptr >= stream->_IO_read_end)
@ -230,17 +225,18 @@ _IO_getc_unlocked(_IO_FILE *stream)
}
__INLINE int
static 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;
}
__INLINE int
static inline int
_IO_putc_unlocked(int c, _IO_FILE *stream)
{
if (stream->_IO_write_ptr >= stream->_IO_write_end)
@ -249,8 +245,6 @@ _IO_putc_unlocked(int c, _IO_FILE *stream)
return (unsigned char)(*stream->_IO_write_ptr++ = c);
}
#undef __INLINE
#ifdef __cplusplus
}
#endif