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.

diff --git a/ChangeLog b/ChangeLog
index 12611489964ce6e2e84ce1cc38984d5ce8f18a44..23a56d69cd06f30d483685fbb93f3a9ed364cffc 100644 (file)
--- 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 331314f784ba2fa2d1d02db43c22894cf4497751..df0da5bac5733f8a8707201460be5ae85bc3a28e 100644 (file)
--- 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 d0e4973768bfa0cf9c5ce078684c4f9e0930829d..4edc2b90941863683db9a2c6bba119b5e05e1eac 100644 (file)
--- 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