101 lines
4.1 KiB
Diff
101 lines
4.1 KiB
Diff
From 397feba12151bec18ab208bd8fe1d9f12b9989d0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Mon, 5 Mar 2018 12:27:52 +0000
|
|
Subject: [PATCH] Workaround removal of libio.h
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
---
|
|
gnulib/lib/fflush.c | 8 ++++----
|
|
gnulib/lib/fpurge.c | 2 +-
|
|
gnulib/lib/freading.c | 2 +-
|
|
gnulib/lib/fseeko.c | 4 ++--
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/gnulib/lib/fflush.c b/gnulib/lib/fflush.c
|
|
index c52883b..3ebbcae 100644
|
|
--- a/gnulib/lib/fflush.c
|
|
+++ b/gnulib/lib/fflush.c
|
|
@@ -32,8 +32,8 @@
|
|
|
|
#undef fflush
|
|
|
|
-
|
|
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
+#define _IO_IN_BACKUP 0x100
|
|
+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
|
|
/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
|
|
static void
|
|
@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
|
|
|
|
#endif
|
|
|
|
-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
|
|
+#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */)
|
|
|
|
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
|
|
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
|
@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
|
|
if (stream == NULL || ! freading (stream))
|
|
return fflush (stream);
|
|
|
|
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
|
|
clear_ungetc_buffer_preserving_position (stream);
|
|
|
|
diff --git a/gnulib/lib/fpurge.c b/gnulib/lib/fpurge.c
|
|
index b236871..ea8f7f5 100644
|
|
--- a/gnulib/lib/fpurge.c
|
|
+++ b/gnulib/lib/fpurge.c
|
|
@@ -62,7 +62,7 @@ fpurge (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_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
fp->_IO_read_end = fp->_IO_read_ptr;
|
|
fp->_IO_write_ptr = fp->_IO_write_base;
|
|
/* Avoid memory leak when there is an active ungetc buffer. */
|
|
diff --git a/gnulib/lib/freading.c b/gnulib/lib/freading.c
|
|
index 67a884d..fffda1e 100644
|
|
--- a/gnulib/lib/freading.c
|
|
+++ b/gnulib/lib/freading.c
|
|
@@ -31,7 +31,7 @@ freading (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_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
return ((fp->_flags & _IO_NO_WRITES) != 0
|
|
|| ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
|
|
&& fp->_IO_read_base != NULL));
|
|
diff --git a/gnulib/lib/fseeko.c b/gnulib/lib/fseeko.c
|
|
index ae9b100..82460e5 100644
|
|
--- a/gnulib/lib/fseeko.c
|
|
+++ b/gnulib/lib/fseeko.c
|
|
@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
|
|
#endif
|
|
|
|
/* These tests are based on fpurge.c. */
|
|
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
if (fp->_IO_read_end == fp->_IO_read_ptr
|
|
&& fp->_IO_write_ptr == fp->_IO_write_base
|
|
&& fp->_IO_save_base == NULL)
|
|
@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
|
|
return -1;
|
|
}
|
|
|
|
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
|
fp->_flags &= ~_IO_EOF_SEEN;
|
|
fp->_offset = pos;
|
|
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
|
--
|
|
2.14.3
|
|
|