diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 277eb74853d4..fe298df89c3c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-29  Matt Kraai  <kraai@alumni.cmu.edu>
+
+	* gthr-gnat.c: Remove #undef UNUSED.
+	(__gnat_default_lock, __gnat_default_unlock): Prototype.
+	(__gnat_task_lock, __gnat_task_unlock): Make declarations
+	prototypes.
+	(__gnat_install_locks): Convert declaration to ISO C90, make
+	parameter declarations prototypes, and remove blank line.
+	* gthr-gnat.h (__gnat_install_locks): Make parameter
+	declarations prototypes.
+
 2003-05-29  Jason Merrill  <jason@redhat.com>
 
 	* Makefile.in (unstrap): Remove stage_last after make unstage1.
@@ -40,6 +51,7 @@
 	(expand_unreachable_stmt): Expand unreachable while statements
 	using genrtl_do_stmt_1.
 
+>>>>>>> 1.17950
 2003-05-29  Richard Sandiford  <rsandifo@redhat.com>
 
 	* config/mips/mips-protos.h (mips_output_load_label): Declare.
diff --git a/gcc/gthr-gnat.c b/gcc/gthr-gnat.c
index 9620135bf9b4..586e7d1a188e 100644
--- a/gcc/gthr-gnat.c
+++ b/gcc/gthr-gnat.c
@@ -35,6 +35,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define UNUSED(x) x __attribute__((unused))
 #endif
 
+void __gnat_default_lock (void);
+void __gnat_default_unlock (void);
+
 void
 __gnat_default_lock (void)
 {
@@ -47,17 +50,14 @@ __gnat_default_unlock (void)
   return;
 }
 
-static void (*__gnat_task_lock) () = *__gnat_default_lock;
-static void (*__gnat_task_unlock) () = *__gnat_default_unlock;
+static void (*__gnat_task_lock) (void) = *__gnat_default_lock;
+static void (*__gnat_task_unlock) (void) = *__gnat_default_unlock;
 
  void
-__gnat_install_locks (lock, unlock)
-     void (*lock) ();
-     void (*unlock) ();
+__gnat_install_locks (void (*lock) (void), void (*unlock) (void))
 {
   __gnat_task_lock = lock;
   __gnat_task_unlock = unlock;
-
 }
 
 int
@@ -79,6 +79,3 @@ __gthread_mutex_unlock (__gthread_mutex_t * UNUSED (mutex))
   __gnat_task_unlock ();
   return 0;
 }
-
-#undef UNUSED
-
diff --git a/gcc/gthr-gnat.h b/gcc/gthr-gnat.h
index 0f49227f913f..727814197c08 100644
--- a/gcc/gthr-gnat.h
+++ b/gcc/gthr-gnat.h
@@ -34,7 +34,7 @@ typedef int __gthread_mutex_t;
 
 #define __GTHREAD_MUTEX_INIT 0
 
-extern void __gnat_install_locks (void (*lock) (), void (*unlock) ());
+extern void __gnat_install_locks (void (*lock) (void), void (*unlock) (void));
 extern int __gthread_active_p (void);
 extern int __gthread_mutex_lock (__gthread_mutex_t *);
 extern int __gthread_mutex_unlock (__gthread_mutex_t *);