summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2020-10-11 16:20:30 +0200
committerBruno Haible <bruno@clisp.org>2020-10-11 16:20:30 +0200
commitae638065f7057625e3d847258b4257e73cf59aa4 (patch)
treef856e608b9bbad0fbe24ddd0d3e5b4246e2cf163
parent075ded5020ef1dddd60a4e5c6d4a369fecefceb2 (diff)
downloadgnulib-ae638065f7057625e3d847258b4257e73cf59aa4.tar.gz
stdioext: Treat OpenServer 6 and UnixWare 7 like OpenServer 5.
Reported Tim Rice <tim@multitalents.net> in <https://lists.gnu.org/archive/html/bug-gnulib/2020-10/msg00005.html>. Uses the info from <https://lists.gnu.org/archive/html/bug-gnulib/2020-10/msg00028.html>. * lib/stdio-impl.h: Test also __SCO_VERSION__ and __sysv5__.
-rw-r--r--ChangeLog9
-rw-r--r--lib/stdio-impl.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 070929e37c..02e8993999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2020-10-11 Bruno Haible <bruno@clisp.org>
+ stdioext: Treat OpenServer 6 and UnixWare 7 like OpenServer 5.
+ Reported Tim Rice <tim@multitalents.net> in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2020-10/msg00005.html>.
+ Uses the info from
+ <https://lists.gnu.org/archive/html/bug-gnulib/2020-10/msg00028.html>.
+ * lib/stdio-impl.h: Test also __SCO_VERSION__ and __sysv5__.
+
+2020-10-11 Bruno Haible <bruno@clisp.org>
+
stdioext: Avoid compilation errors on UnixWare 7.
Reported by Tim Rice <tim@multitalents.net> in
<https://lists.gnu.org/archive/html/bug-gnulib/2020-09/msg00127.html>.
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index 067b95ebd6..15066aa59f 100644
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -175,7 +175,7 @@
# define fp_ fp
# endif
-# if defined _SCO_DS /* OpenServer */
+# if defined _SCO_DS || (defined __SCO_VERSION__ || defined __sysv5__) /* OpenServer 5, OpenServer 6, UnixWare 7 */
# define _cnt __cnt
# define _ptr __ptr
# define _base __base