5 files changed, 6 insertions, 6 deletions
diff --git a/libio/oldfileops.c b/libio/oldfileops.c
index 8998ee9b0d..2efbadb44e 100644
--- a/libio/oldfileops.c
+++ b/libio/oldfileops.c
@@ -266,7 +266,7 @@ _IO_old_do_write (fp, data, to_do)
      const char *data;
      _IO_size_t to_do;
 {
-  return (to_do == 0 || old_do_write (fp, data, to_do) == to_do)
+  return (to_do == 0 || (_IO_size_t) old_do_write (fp, data, to_do) == to_do)
 	 ? 0 : EOF;
 }
 
diff --git a/libio/tst-fgetws.c b/libio/tst-fgetws.c
index 88b6261bb8..66fb9d1d8e 100644
--- a/libio/tst-fgetws.c
+++ b/libio/tst-fgetws.c
@@ -13,7 +13,7 @@
 int
 main (int argc, char *argv[])
 {
-  int i;
+  size_t i;
   FILE   *fp;
   wchar_t *ret, wcs[WIDE_STR_LEN];
   int result = 0;
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
     }
   else
     {
-      int i;
+      size_t i;
 
       printf ("Return Value: %p\n", ret);
       for (i = 0; i < wcslen (wcs) + 1; i++)
diff --git a/libio/tst-mmap2-eofsync.c b/libio/tst-mmap2-eofsync.c
index 60bad94027..f3699656ab 100644
--- a/libio/tst-mmap2-eofsync.c
+++ b/libio/tst-mmap2-eofsync.c
@@ -78,7 +78,7 @@ do_test (void)
     }
 
   c = write (temp_fd, pages + pagesize, pagesize);
-  if (c == pagesize)
+  if (c == (ssize_t) pagesize)
     printf ("wrote more to file\n");
   else
     {
diff --git a/libio/tst-widetext.c b/libio/tst-widetext.c
index ed196317a9..48444380d8 100644
--- a/libio/tst-widetext.c
+++ b/libio/tst-widetext.c
@@ -89,7 +89,7 @@ main (void)
 	exit (1);
       }
 
-    if  ((size_t) nonr == -1 )
+    if  (nonr == (size_t) -1)
       {
 	printf ("\
 %u: iconv returned with %Zd and errno = %m (inleft: %Zd, outleft: %Zd)\n",
diff --git a/libio/tst_swprintf.c b/libio/tst_swprintf.c
index a82ef88e7c..4dadd58741 100644
--- a/libio/tst_swprintf.c
+++ b/libio/tst_swprintf.c
@@ -21,7 +21,7 @@ static const struct
 int
 main (int argc, char *argv[])
 {
-  int n;
+  size_t n;
   int result = 0;
 
   puts ("test 1");