X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fada%2Fctrl_c.c;h=a860b767cba77b65d6b5660a99fe9927ad5c87c0;hb=4c97a37dc04bd1838ea3d099bebf2900e10322dd;hp=22d00667275dd4bed38e379568771160b543970c;hpb=f0a28ccbd3dd7601546a27587720799563e5dbb5;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/ada/ctrl_c.c b/gcc/ada/ctrl_c.c
index 22d00667275..a860b767cba 100644
--- a/gcc/ada/ctrl_c.c
+++ b/gcc/ada/ctrl_c.c
@@ -6,24 +6,23 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *        Copyright (C) 2002-2003, Free Software Foundation, Inc.           *
+ *        Copyright (C) 2002-2009, Free Software Foundation, Inc.           *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
- * ware  Foundation;  either version 2,  or (at your option) any later ver- *
+ * ware  Foundation;  either version 3,  or (at your option) any later ver- *
  * sion.  GNAT is distributed in the hope that it will be useful, but WITH- *
  * OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY *
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License *
- * for  more details.  You should have  received  a copy of the GNU General *
- * Public License  distributed with GNAT;  see file COPYING.  If not, write *
- * to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, *
- * MA 02111-1307, USA.                                                      *
+ * or FITNESS FOR A PARTICULAR PURPOSE.                                     *
  *                                                                          *
- * As a  special  exception,  if you  link  this file  with other  files to *
- * produce an executable,  this file does not by itself cause the resulting *
- * executable to be covered by the GNU General Public License. This except- *
- * ion does not  however invalidate  any other reasons  why the  executable *
- * file might be covered by the  GNU Public License.                        *
+ * As a special exception under Section 7 of GPL version 3, you are granted *
+ * additional permissions described in the GCC Runtime Library Exception,   *
+ * version 3.1, as published by the Free Software Foundation.               *
+ *                                                                          *
+ * You should have received a copy of the GNU General Public License and    *
+ * a copy of the GCC Runtime Library Exception along with this program;     *
+ * see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    *
+ * <http://www.gnu.org/licenses/>.                                          *
  *                                                                          *
  * GNAT was originally developed  by the GNAT team at  New York University. *
  * Extensive contributions were provided by Ada Core Technologies Inc.      *
@@ -50,7 +49,8 @@ void __gnat_uninstall_int_handler (void);
 
 /* POSIX implementation */
 
-#if (defined (_AIX) || defined (unix)) && !defined (__vxworks)
+#if (defined (__unix__) || defined (_AIX) || defined (__APPLE__)) \
+ && !defined (__vxworks)
 
 #include <signal.h>
 
@@ -75,7 +75,12 @@ __gnat_install_int_handler (void (*proc) (void))
   if (sigint_intercepted == 0)
     {
       act.sa_handler = __gnat_int_handler;
+#if defined (__Lynx__)
+      /* LynxOS does not support SA_RESTART. */
+      act.sa_flags = 0;
+#else
       act.sa_flags = SA_RESTART;
+#endif
       sigemptyset (&act.sa_mask);
       sigaction (SIGINT, &act, &original_act);
     }
@@ -112,7 +117,10 @@ __gnat_int_handler  (DWORD dwCtrlType)
     case CTRL_C_EVENT:
     case CTRL_BREAK_EVENT:
       if (sigint_intercepted != 0)
-        sigint_intercepted ();
+        {
+          sigint_intercepted ();
+          return TRUE;
+        }
       break;
 
     case CTRL_CLOSE_EVENT:
@@ -120,6 +128,8 @@ __gnat_int_handler  (DWORD dwCtrlType)
     case CTRL_SHUTDOWN_EVENT:
       break;
     }
+
+  return FALSE;
 }
 
 void
@@ -132,7 +142,7 @@ __gnat_install_int_handler (void (*proc) (void))
 }
 
 void
-__gnat_uninstall_int_handler ()
+__gnat_uninstall_int_handler (void)
 {
   if (sigint_intercepted != NULL)
     SetConsoleCtrlHandler (__gnat_int_handler, FALSE);
@@ -150,7 +160,7 @@ __gnat_install_int_handler (void (*proc) (void) __attribute__ ((unused)))
 }
 
 void
-__gnat_uninstall_int_handler ()
+__gnat_uninstall_int_handler (void)
 {
 }
 #endif