* Makefile.in (reload1.o-warn): Remove.

[pf3gnuchains/gcc-fork.git] / gcc / ada / cio.c

diff --git a/gcc/ada/cio.c b/gcc/ada/cio.c
index 65a7869..6fba5a0 100644 (file)
--- a/gcc/ada/cio.c
+++ b/gcc/ada/cio.c
@@ -6,9 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *                            $Revision$
- *                                                                          *
- *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
+ *          Copyright (C) 1992-2005, 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- *
@@ -18,8 +16,8 @@
  * 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.                                                      *
+ * to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, *
+ * Boston, MA 02110-1301, USA.                                              *
  *                                                                          *
  * 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 *
@@ -28,7 +26,7 @@
  * file might be covered by the  GNU Public License.                        *
  *                                                                          *
  * GNAT was originally developed  by the GNAT team at  New York University. *
- * It is now maintained by Ada Core Technologies Inc (http://www.gnat.com). *
+ * Extensive contributions were provided by Ada Core Technologies Inc.      *
  *                                                                          *
  ****************************************************************************/
 
@@ -43,40 +41,6 @@
 
 #include "adaint.h"
 
-#ifdef __RT__
-
-/* Linux kernel modules don't have inputs, so don't define get_int.
-   Simple output can be done via printk. */
-
-void
-put_char (c)
-     int c;
-{
-  printk ("%c", c);
-}
-
-void
-put_char_stderr (c)
-     int c;
-{
-  put_char (c);
-}
-
-void
-put_int (x)
-     int x;
-{
-  printk ("%d", x);
-}
-
-void
-put_int_stderr (int x)
-{
-  put_int (x);
-}
-
-#else
-
 /* Don't use macros on GNU/Linux since they cause incompatible changes between
    glibc 2.0 and 2.1 */
 #ifdef linux
@@ -84,10 +48,16 @@ put_int_stderr (int x)
 #undef getchar
 #undef fputc
 #undef stderr
+#undef stdout
+#endif
+
+#ifdef VTHREADS
+#undef putchar
+#undef getchar
 #endif
 
 int
-get_char ()
+get_char (void)
 {
 #ifdef VMS
   return decc$getchar();
@@ -97,7 +67,7 @@ get_char ()
 }
 
 int
-get_int ()
+get_int (void)
 {
   int x;
 
@@ -106,39 +76,35 @@ get_int ()
 }
 
 void
-put_int (x)
-     int x;
+put_int (int x)
 {
-  printf ("%d", x);
+   /* Use fprintf rather than printf, since the latter is unbuffered
+      on vxworks */
+   fprintf (stdout, "%d", x);
 }
 
 void
-put_int_stderr (x)
-   int x;
+put_int_stderr (int x)
 {
   fprintf (stderr, "%d", x);
 }
 
 void
-put_char (c)
-     int c;
+put_char (int c)
 {
   putchar (c);
 }
 
 void
-put_char_stderr (c)
-     int c;
+put_char_stderr (int c)
 {
   fputc (c, stderr);
 }
-#endif
 
 #ifdef __vxworks
 
 char *
-mktemp (template)
-     char *template;
+mktemp (char *template)
 {
   return tmpnam (NULL);
 }