X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffbufmode.c;h=42a305b59d8ff25598748eda1a76437d6c7eca4a;hb=fbe6ced5d2fdadeeea4194725d05a52cf3b5ebd7;hp=faaf08906b46735695a2e1c2409160c4c3cf4bd5;hpb=569eba622c635a2bd19408ff284cf07804012c54;p=gnulib.git

diff --git a/lib/fbufmode.c b/lib/fbufmode.c
index faaf08906..42a305b59 100644
--- a/lib/fbufmode.c
+++ b/lib/fbufmode.c
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ 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_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */
+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 # if HAVE___FLBF                    /* glibc >= 2.2 */
   if (__flbf (fp))
     return _IOLBF;
@@ -42,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 */
@@ -73,6 +73,10 @@ fbufmode (FILE *fp)
   if (fp->_Mode & 0x800 /* _MNBF */)
     return _IONBF;
   return _IOFBF;
+#elif defined __MINT__              /* Atari FreeMiNT */
+  if (fp->__linebuf)
+    return _IOLBF;
+  return (fp->__bufsize > 0 ? _IOFBF : _IONBF);
 #else
  #error "Please port gnulib fbufmode.c to your platform! Look at the setvbuf implementation."
 #endif