diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index dc1f29a4596..3234ab37ddb 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-04  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR ada/40608
+	* init.c (APPLE): Include <mach/mach_init.h>.
+	(__gnat_is_stack_guard, APPLE): Add ATTRIBUTE_UNUSED marker.
+
 2009-07-04  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* ada-tree.h (SET_TYPE_LANG_SPECIFIC): Rewrite.
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 432e4b1ec4e..3193dff00bb 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -2103,6 +2103,7 @@ __gnat_install_handler(void)
 
 #include <signal.h>
 #include <mach/mach_vm.h>
+#include <mach/mach_init.h>
 #include <mach/vm_statistics.h>
 
 /* This must be in keeping with System.OS_Interface.Alternate_Stack_Size.  */
@@ -2140,7 +2141,7 @@ __gnat_is_stack_guard (mach_vm_address_t addr)
 }
 
 static void
-__gnat_error_handler (int sig, siginfo_t * si, void * uc)
+__gnat_error_handler (int sig, siginfo_t * si, void * uc ATTRIBUTE_UNUSED)
 {
   struct Exception_Data *exception;
   const char *msg;