From: Hauke Fath <hauke@espresso.rhein-neckar.de>
Date: Sun, 4 Apr 2010 23:13:18 +0000 (+0200)
Subject: Port extended stdio to NetBSD 1.5.
X-Git-Tag: v0.1~4336
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=478b8e3ee921a64ab6b7653157279201f5dd78f0;p=gnulib.git

Port extended stdio to NetBSD 1.5.
---

diff --git a/ChangeLog b/ChangeLog
index f88dbc786..d62f2daed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-04  Hauke Fath  <hauke@espresso.rhein-neckar.de>  (tiny change)
+            Bruno Haible  <bruno@clisp.org>
+
+	Port extended stdio to NetBSD 1.5.
+	* lib/stdio-impl.h [NetBSD]: Include <sys/param.h>.
+	(struct __sfileext, fp_ub): Define the "old way" for NetBSD 1.5Z and
+	older.
+
 2010-04-04  Bruno Haible  <bruno@clisp.org>
 
 	string: Remove unused substitution.
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index 7d719efe1..0e67f66ef 100644
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -1,5 +1,5 @@
 /* Implementation details of FILE streams.
-   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 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
@@ -21,6 +21,11 @@
 
 /* BSD stdio derived implementations.  */
 
+#if defined __NetBSD__                         /* NetBSD */
+/* Get __NetBSD_Version__.  */
+# include <sys/param.h>
+#endif
+
 #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
 
 # if defined __DragonFly__          /* DragonFly */
@@ -50,7 +55,7 @@
 #  define fp_ fp
 # endif
 
-# if defined __NetBSD__ || defined __OpenBSD__ /* NetBSD, OpenBSD */
+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ /* NetBSD >= 1.5ZA, OpenBSD */
   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
      and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
   struct __sfileext
@@ -59,7 +64,7 @@
       /* More fields, not relevant here.  */
     };
 #  define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
-# else                                         /* FreeBSD, DragonFly, MacOS X, Cygwin */
+# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, MacOS X, Cygwin */
 #  define fp_ub fp_->_ub
 # endif