diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bf86119d39..b3f69fb1cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Mon Aug  2 12:06:00 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* thread.c (thread_switch): Define as static.
+	(add_thread): Cast return value from xmalloc.
+
 	* gdbtypes.c (fill_in_vptr_fieldno): Call check_stub_type.
 	* gdbtypes.{c,h}: Improve comments on vptr_fieldno.
 
diff --git a/gdb/thread.c b/gdb/thread.c
index 207687a842..ea5173f7de 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -76,7 +76,7 @@ add_thread (pid)
 {
   struct thread_info *tp;
 
-  tp = xmalloc (sizeof (struct thread_info));
+  tp = (struct thread_info *) xmalloc (sizeof (struct thread_info));
 
   tp->pid = pid;
   tp->num = ++highest_thread_num;
@@ -180,7 +180,7 @@ info_threads_command (arg, from_tty)
 
 /* Switch from one thread to another. */
 
-void
+static void
 thread_switch (pid)
      int pid;
 {