[Haiku-commits] r29547 - haiku/trunk/headers/posix

[bonefish at BerliOS]

Author: bonefish
Date: 2009-03-16 00:45:05 +0100 (Mon, 16 Mar 2009)
New Revision: 29547
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=29547&view=rev

Modified:
   haiku/trunk/headers/posix/libio.h
Log:
Reverted r29471. It breaks building kernel code including this heaader in
debug mode with gcc 2.95.3.


Modified: haiku/trunk/headers/posix/libio.h
===================================================================
--- haiku/trunk/headers/posix/libio.h	2009-03-15 18:24:14 UTC (rev 29546)
+++ haiku/trunk/headers/posix/libio.h	2009-03-15 23:45:05 UTC (rev 29547)
@@ -174,10 +174,10 @@
 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 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 @@
 }
 
 
-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 @@
 	return (unsigned char)(*stream->_IO_write_ptr++ = c);
 }
 
+#undef __INLINE
+
 #ifdef __cplusplus
 }
 #endif