6 files changed, 20 insertions, 11 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a7caa79..a97ac09 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2020-09-17  Pedro Alves  <pedro@palves.net>
 
+	* gdb.base/exprs.c: Replace 'this' with 'self' throughout.
+	* gdb.base/ptype.c: : Replace 'this' with 'self' throughout.
+	(charfoo, intfoo): Define full prototype.
+	* gdb.base/ptype1.c (charfoo): Define full prototype.
+	* gdb.base/setvar.c: Replace 'this' with 'self' throughout.
+	* gdb.base/whatis.c: Replace 'this' with 'self' throughout.
+
+2020-09-17  Pedro Alves  <pedro@palves.net>
+
 	* gdb.base/charset.c [__cplusplus] (wchar_t, char16_t, char32_t):
 	Don't define.
 	(utf_32_string): Compile for both C and C++.
diff --git a/gdb/testsuite/gdb.base/exprs.c b/gdb/testsuite/gdb.base/exprs.c
index cd605f3..195b88e 100644
--- a/gdb/testsuite/gdb.base/exprs.c
+++ b/gdb/testsuite/gdb.base/exprs.c
@@ -156,7 +156,7 @@ double		v_double_func () { return (0.0); }
 struct link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif
@@ -166,7 +166,7 @@ struct link {
 union tu_link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif
diff --git a/gdb/testsuite/gdb.base/ptype.c b/gdb/testsuite/gdb.base/ptype.c
index 4148da7..6d12c2a 100644
--- a/gdb/testsuite/gdb.base/ptype.c
+++ b/gdb/testsuite/gdb.base/ptype.c
@@ -168,7 +168,7 @@ double		v_double_func () { return (0.0); }
 struct link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif
@@ -178,7 +178,7 @@ struct link {
 union tu_link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif
@@ -269,11 +269,11 @@ func_type v_func_type;
 
 /***********/
 
-extern char charfoo ();
+extern char charfoo (int);
 
 typedef int foo;
 
-foo intfoo (afoo)
+foo intfoo (int afoo)
 {
   charfoo (afoo);
   return (afoo * 2);
diff --git a/gdb/testsuite/gdb.base/ptype1.c b/gdb/testsuite/gdb.base/ptype1.c
index 2587150..43ab056 100644
--- a/gdb/testsuite/gdb.base/ptype1.c
+++ b/gdb/testsuite/gdb.base/ptype1.c
@@ -1,6 +1,6 @@
 typedef char foo;
 
-foo charfoo (afoo)
+foo charfoo (int afoo)
 {
   return (afoo * 2);
 }
diff --git a/gdb/testsuite/gdb.base/setvar.c b/gdb/testsuite/gdb.base/setvar.c
index 1b8d808..415eb6f 100644
--- a/gdb/testsuite/gdb.base/setvar.c
+++ b/gdb/testsuite/gdb.base/setvar.c
@@ -161,7 +161,7 @@ double		v_double_func () { return (0.0); }
 struct link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif
@@ -171,7 +171,7 @@ struct link {
 union tu_link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif
diff --git a/gdb/testsuite/gdb.base/whatis.c b/gdb/testsuite/gdb.base/whatis.c
index 11c84d2..743cb61 100644
--- a/gdb/testsuite/gdb.base/whatis.c
+++ b/gdb/testsuite/gdb.base/whatis.c
@@ -207,7 +207,7 @@ double		v_double_func () { return (0.0); }
 struct link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif
@@ -217,7 +217,7 @@ struct link {
 union tu_link {
 	struct link *next;
 #ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
+	struct link *(*linkfunc) (struct link *self, int flags);
 #else
 	struct link *(*linkfunc) ();
 #endif