diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f969a9eb0c..a36834ec1e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* linux-thread-db.c (find_new_threads_once): Change errp and err types
+	to td_err_e.
+	(thread_db_find_new_threads_2): Change err type to td_err_e.
+
 2009-12-03  Paul Pluzhnikov  <ppluzhnikov@google.com>
 	
 	PR gdb/11022
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 32ac5c5d6d..c48b87006e 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -1363,11 +1363,11 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data)
 
 static int
 find_new_threads_once (struct thread_db_info *info, int iteration,
-		       int *errp)
+		       td_err_e *errp)
 {
   volatile struct gdb_exception except;
   struct callback_data data;
-  int err = TD_ERR;
+  td_err_e err = TD_ERR;
 
   data.info = info;
   data.new_threads = 0;
@@ -1440,7 +1440,7 @@ thread_db_find_new_threads_2 (ptid_t ptid, int until_no_new)
     }
   else
     {
-      int err;
+      td_err_e err;
 
       find_new_threads_once (info, 0, &err);
       if (err != TD_OK)