From 209f53f5248aa219cad6261bdd6622c804c485e9 Mon Sep 17 00:00:00 2001
From: Pierre Muller <muller@sourceware.org>
Date: Thu, 1 Oct 2009 15:39:13 +0000
Subject: [PATCH] 	* gdb.base/fileio.c (test_lseek): typecast ofs_t ret
 variable to 	long type. 	(test_unlink): Correct printf string. 	*
 gdb.base/checkpoint.c (main): Correct fprintf string for variable i. 	*
 gdb.threads/attachstop-mt.c: Add #include <string.h>.

---
 gdb/testsuite/ChangeLog                   | 8 ++++++++
 gdb/testsuite/gdb.base/checkpoint.c       | 4 ++--
 gdb/testsuite/gdb.base/fileio.c           | 8 ++++----
 gdb/testsuite/gdb.threads/attachstop-mt.c | 1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7297f0c9879..1ab841181af 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-01  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* gdb.base/fileio.c (test_lseek): typecast ofs_t ret variable to
+	long type.
+	(test_unlink): Correct printf string.
+	* gdb.base/checkpoint.c (main): Correct fprintf string for variable i.
+	* gdb.threads/attachstop-mt.c: Add #include <string.h>.
+
 2009-09-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/breakpoint-shadow.exp: Move the ia64 part into ...
diff --git a/gdb/testsuite/gdb.base/checkpoint.c b/gdb/testsuite/gdb.base/checkpoint.c
index 4a412684fe2..2d44a741504 100644
--- a/gdb/testsuite/gdb.base/checkpoint.c
+++ b/gdb/testsuite/gdb.base/checkpoint.c
@@ -40,9 +40,9 @@ main()
   for (i = 0; ; i++)
     {
       if (ftell (in) != i)
-	fprintf (stderr, "Input error at %d\n", i);
+	fprintf (stderr, "Input error at %ld\n", i);
       if (ftell (out) != i)
-	fprintf (stderr, "Output error at %d\n", i);
+	fprintf (stderr, "Output error at %ld\n", i);
       c = fgetc (in);
       if (c == '\n')
 	lines++;	/* breakpoint 1 */
diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c
index 3910da56876..329522f3a8a 100644
--- a/gdb/testsuite/gdb.base/fileio.c
+++ b/gdb/testsuite/gdb.base/fileio.c
@@ -231,13 +231,13 @@ test_lseek ()
     }
   else
     {
-      printf ("lseek 1: ret = %d, errno = %d %s\n", ret, errno,
+      printf ("lseek 1: ret = %ld, errno = %d %s\n", (long) ret, errno,
 	      strerrno (errno));
       stop ();
-      printf ("lseek 2: ret = %d, errno = %d %s\n", ret, errno,
+      printf ("lseek 2: ret = %ld, errno = %d %s\n", (long) ret, errno,
 	      strerrno (errno));
       stop ();
-      printf ("lseek 3: ret = %d, errno = %d %s\n", ret, errno,
+      printf ("lseek 3: ret = %ld, errno = %d %s\n", (long) ret, errno,
 	      strerrno (errno));
     }
   /* Seeking on an invalid file descriptor */
@@ -473,7 +473,7 @@ test_unlink ()
 		  strerrno (errno));
         }
       else
-	printf ("unlink 2: ret = %d chmod failed\n", ret, errno);
+	printf ("unlink 2: ret = %d chmod failed, errno= %d\n", ret, errno);
     }
   else
     printf ("unlink 2: ret = %d, errno = %d\n", ret, errno);
diff --git a/gdb/testsuite/gdb.threads/attachstop-mt.c b/gdb/testsuite/gdb.threads/attachstop-mt.c
index fa77c9a4add..061411a04f8 100644
--- a/gdb/testsuite/gdb.threads/attachstop-mt.c
+++ b/gdb/testsuite/gdb.threads/attachstop-mt.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <stdio.h>
+#include <string.h>
 
 /* Red Hat BZ PR 197584.c */
 
-- 
2.30.2