summaryrefslogtreecommitdiff
path: root/gl/stdio-impl.h
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2010-04-13 20:18:44 +0200
committerSimon Josefsson <simon@josefsson.org>2010-04-13 20:24:59 +0200
commit30748a9bcbfb76460e42ec96b6988ffc69267680 (patch)
tree95459aa136a9213f4cea7b42fa50dcaffb827723 /gl/stdio-impl.h
parentd0d9fa436ed1dce70395d477f9b15199b0482bb6 (diff)
downloadgnutls-30748a9bcbfb76460e42ec96b6988ffc69267680.tar.gz
Update gnulib files, fix syntax-check warnings.
Diffstat (limited to 'gl/stdio-impl.h')
-rw-r--r--gl/stdio-impl.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/gl/stdio-impl.h b/gl/stdio-impl.h
index 7d719efe1b..0e67f66ef6 100644
--- a/gl/stdio-impl.h
+++ b/gl/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