Changeset 3714

Timestamp:

Mar 17, 2011, 6:04:48 PM (14 years ago)

Author:

bird

Message:

0.6: Backported r3712 & r3713: stdio.h,features.h: Don't use gcc's 'extern inline' feature with 4.3.0 and later. Fixes #222.

Location:

branches/libc-0.6/src/emx/include

Files:

• features.h (modified) (1 diff)
• stdio.h (modified) (3 diffs)

branches/libc-0.6/src/emx/include/features.h

@@ -368 +368 @@
 
 /* Decide whether we can define 'extern inline' functions in headers.  */
-#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
+#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (4, 3) && defined __OPTIMIZE__ \
     && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__
 # define __USE_EXTERN_INLINES   1

branches/libc-0.6/src/emx/include/stdio.h

@@ -465 +465 @@
 #define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
 #if defined(__GNUC__) && defined(__STDC__)
-static __inline int __sputc(int _c, FILE *_p) {
+static __inline__ int __sputc(int _c, FILE *_p) {
         if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                 return (*_p->_p++ = _c);
@@ -527 +527 @@
 int _rmtmp (void);
 
+#include <features.h>
+#ifdef __USE_EXTERN_INLINES
+
 extern __inline__ int feof (FILE *_s)
 {
@@ -539 +542 @@
 extern __inline__ int getchar (void) { return getc (stdin); }
 extern __inline__ int putchar (int _c) { return putc (_c, stdout); }
+
+#endif /* __USE_EXTERN_INLINES */
 
 #if !defined (__STRICT_ANSI__) && !defined (_POSIX_SOURCE) || defined(__USE_EMX)