This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[hurd,commited 1/3] hurd: Fix building libio/tst-memstream3.c
- From: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- To: libc-alpha at sourceware dot org
- Cc: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- Date: Sun, 28 Jan 2018 18:23:06 +0100
- Subject: [hurd,commited 1/3] hurd: Fix building libio/tst-memstream3.c
- Authentication-results: sourceware.org; auth=none
- References: <20180128172308.7647-1-samuel.thibault@ens-lyon.org>
FWRITE is already an fcntl.h macro.
* libio/tst-memstream3.c (FWRITE): Rename to _FWRITE.
(do_test_bz20181): Rename accordingly.
* libio/tst-wmemstream3.c (FWRITE): Rename accordingly.
---
ChangeLog | 3 +++
libio/tst-memstream3.c | 10 +++++-----
libio/tst-wmemstream3.c | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1261148996..23a56d69cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,9 @@
* sysdeps/mach/hurd/check_pf.c: New file.
* sysdeps/mach/hurd/libhurduser.abilist: New file.
* sysdeps/mach/libmachuser.abilist: New file.
+ * libio/tst-memstream3.c (FWRITE): Rename to _FWRITE.
+ (do_test_bz20181): Rename accordingly.
+ * libio/tst-wmemstream3.c (FWRITE): Rename accordingly.
2008-12-18 Thomas Schwinge <tschwinge@gnu.org>
diff --git a/libio/tst-memstream3.c b/libio/tst-memstream3.c
index 331314f784..df0da5bac5 100644
--- a/libio/tst-memstream3.c
+++ b/libio/tst-memstream3.c
@@ -29,7 +29,7 @@
# define W(o) o
# define OPEN_MEMSTREAM open_memstream
# define PRINTF printf
-# define FWRITE fwrite
+# define _FWRITE fwrite
# define FPUTC fputc
# define STRCMP strcmp
#endif
@@ -114,14 +114,14 @@ do_test_bz20181 (void)
if (fp == NULL)
ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM));
- if ((ret = FWRITE (W("abc"), 1, 3, fp)) != 3)
- ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE), errno);
+ if ((ret = _FWRITE (W("abc"), 1, 3, fp)) != 3)
+ ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno);
if (fseek (fp, 0, SEEK_SET) != 0)
ERROR_RET1 ("fseek failed (errno = %d)\n", errno);
- if (FWRITE (W("z"), 1, 1, fp) != 1)
- ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE), errno);
+ if (_FWRITE (W("z"), 1, 1, fp) != 1)
+ ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno);
if (fflush (fp) != 0)
ERROR_RET1 ("fflush failed (errno = %d)\n", errno);
diff --git a/libio/tst-wmemstream3.c b/libio/tst-wmemstream3.c
index d0e4973768..4edc2b9094 100644
--- a/libio/tst-wmemstream3.c
+++ b/libio/tst-wmemstream3.c
@@ -37,7 +37,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq)
#define W(o) L##o
#define OPEN_MEMSTREAM open_wmemstream
#define PRINTF wprintf
-#define FWRITE fwwrite
+#define _FWRITE fwwrite
#define FPUTC fputwc
#define STRCMP wcscmp
--
2.15.1