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.
This commit is contained in:
Samuel Thibault 2018-01-28 17:45:41 +01:00
parent 5f982b0beb
commit cef7166ac1
3 changed files with 9 additions and 6 deletions

View File

@ -53,6 +53,9 @@
* sysdeps/mach/hurd/check_pf.c: New file. * sysdeps/mach/hurd/check_pf.c: New file.
* sysdeps/mach/hurd/libhurduser.abilist: New file. * sysdeps/mach/hurd/libhurduser.abilist: New file.
* sysdeps/mach/libmachuser.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> 2008-12-18 Thomas Schwinge <tschwinge@gnu.org>

View File

@ -29,7 +29,7 @@
# define W(o) o # define W(o) o
# define OPEN_MEMSTREAM open_memstream # define OPEN_MEMSTREAM open_memstream
# define PRINTF printf # define PRINTF printf
# define FWRITE fwrite # define _FWRITE fwrite
# define FPUTC fputc # define FPUTC fputc
# define STRCMP strcmp # define STRCMP strcmp
#endif #endif
@ -114,14 +114,14 @@ do_test_bz20181 (void)
if (fp == NULL) if (fp == NULL)
ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM)); ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM));
if ((ret = FWRITE (W("abc"), 1, 3, fp)) != 3) if ((ret = _FWRITE (W("abc"), 1, 3, fp)) != 3)
ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE), errno); ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno);
if (fseek (fp, 0, SEEK_SET) != 0) if (fseek (fp, 0, SEEK_SET) != 0)
ERROR_RET1 ("fseek failed (errno = %d)\n", errno); ERROR_RET1 ("fseek failed (errno = %d)\n", errno);
if (FWRITE (W("z"), 1, 1, fp) != 1) if (_FWRITE (W("z"), 1, 1, fp) != 1)
ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE), errno); ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno);
if (fflush (fp) != 0) if (fflush (fp) != 0)
ERROR_RET1 ("fflush failed (errno = %d)\n", errno); ERROR_RET1 ("fflush failed (errno = %d)\n", errno);

View File

@ -37,7 +37,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq)
#define W(o) L##o #define W(o) L##o
#define OPEN_MEMSTREAM open_wmemstream #define OPEN_MEMSTREAM open_wmemstream
#define PRINTF wprintf #define PRINTF wprintf
#define FWRITE fwwrite #define _FWRITE fwwrite
#define FPUTC fputwc #define FPUTC fputwc
#define STRCMP wcscmp #define STRCMP wcscmp