diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-28 17:45:41 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-28 17:45:41 +0100 |
| commit | cef7166ac10cff95e8e8ab76e32376faf34800e5 (patch) | |
| tree | e9dbae878483500bcb87edbc17c884489e29a529 | |
| parent | 5f982b0beb0f337ba3dfdae85462192d06b5af89 (diff) | |
| download | glibc-cef7166ac10cff95e8e8ab76e32376faf34800e5.tar glibc-cef7166ac10cff95e8e8ab76e32376faf34800e5.tar.gz glibc-cef7166ac10cff95e8e8ab76e32376faf34800e5.tar.bz2 glibc-cef7166ac10cff95e8e8ab76e32376faf34800e5.zip | |
hurd: Fix building libio/tst-memstream3.c
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.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | libio/tst-memstream3.c | 10 | ||||
| -rw-r--r-- | libio/tst-wmemstream3.c | 2 |
3 files changed, 9 insertions, 6 deletions
@@ -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 |