diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cc89930aab..1bfbc7dd72 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Joel Brobecker  <brobecker@adacore.com>
+
+	* aix-thread.c (getthrds): Fix type of 4th parameter.
+	(get_signaled_thread): Change type of variable ktid to tid_t.
+
 2012-12-06  Hui Zhu  <hui_zhu@mentor.com>
 
 	* dwarf2loc.c (dwarf_expr_frame_base): Add check for the return
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 5da6c4eadb..3d8b453c2c 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -59,7 +59,7 @@
 #include <sys/pthdebug.h>
 
 #if !HAVE_DECL_GETTHRDS
-extern int getthrds (pid_t, struct thrdsinfo64 *, int, pthdb_tid_t *, int);
+extern int getthrds (pid_t, struct thrdsinfo64 *, int, tid_t *, int);
 #endif
 
 /* Whether to emit debugging output.  */
@@ -648,7 +648,7 @@ static pthdb_tid_t
 get_signaled_thread (void)
 {
   struct thrdsinfo64 thrinf;
-  pthdb_tid_t ktid = 0;
+  tid_t ktid = 0;
   int result = 0;
 
   while (1)