X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffbufmode.c;h=961ae2adb2e1cf81433f3a1ac928add13675458c;hb=b314ca18dc36e59297f66b2508fd58535a1cd724;hp=c775fc2e701d5aeafeddfa31ce9c58c5584fd2e2;hpb=cc6492ad1a98f8e0609788ed65dc7d2b874c991e;p=gnulib.git

diff --git a/lib/fbufmode.c b/lib/fbufmode.c
index c775fc2e7..961ae2adb 100644
--- a/lib/fbufmode.c
+++ b/lib/fbufmode.c
@@ -23,13 +23,15 @@
 # include <stdio_ext.h>
 #endif
 
+#include "stdio-impl.h"
+
 int
 fbufmode (FILE *fp)
 {
   /* Most systems provide FILE as a struct and the necessary bitmask in
      <stdio.h>, because they need it for implementing getc() and putc() as
      fast macros.  */
-#if defined _IO_ferror_unlocked     /* GNU libc, BeOS */
+#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
 # if HAVE___FLBF                    /* glibc >= 2.2 */
   if (__flbf (fp))
     return _IOLBF;
@@ -40,10 +42,10 @@ fbufmode (FILE *fp)
   if (fp->_flags & _IO_UNBUFFERED)
     return _IONBF;
   return _IOFBF;
-#elif defined __sferror             /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */
-  if (fp->_flags & __SLBF)
+#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+  if (fp_->_flags & __SLBF)
     return _IOLBF;
-  if (fp->_flags & __SNBF)
+  if (fp_->_flags & __SNBF)
     return _IONBF;
   return _IOFBF;
 #elif defined __EMX__               /* emx+gcc */
@@ -56,23 +58,9 @@ fbufmode (FILE *fp)
   if (fp->_flag & _IOLBF)
     return _IOLBF;
 # endif
-# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */
-#  define fp_ ((struct { unsigned char *_ptr; \
-			 unsigned char *_base; \
-			 unsigned char *_end; \
-			 long _cnt; \
-			 int _file; \
-			 unsigned int _flag; \
-		       } *) fp)
-  return fp_->_flag & (_IONBF | _IOFBF);
-# else
-#  if defined _SCO_DS               /* OpenServer */
-#   define _flag __flag
-#  endif
-  if (fp->_flag & _IONBF)
+  if (fp_->_flag & _IONBF)
     return _IONBF;
   return _IOFBF;
-# endif
 #elif defined __UCLIBC__            /* uClibc */
   if (fp->__modeflags & __FLAG_LBF)
     return _IOLBF;