Merge tree-ssa-20020619-branch into mainline.

[platform/upstream/gcc.git] / gcc / ada / cal.c

diff --git a/gcc/ada/cal.c b/gcc/ada/cal.c
index d0a7f54..8f8930e 100644 (file)
--- a/gcc/ada/cal.c
+++ b/gcc/ada/cal.c
@@ -6,9 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *                            $Revision: 1.1 $
- *                                                                          *
- *          Copyright (C) 1992-2001, Free Software Foundation, Inc.         *
+ *          Copyright (C) 1992-2003, 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- *
@@ -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.      *
  *                                                                          *
  ****************************************************************************/
 
@@ -60,6 +58,13 @@ __gnat_duration_to_timeval (long sec, long usec, void *t)
 #include <sys/time.h>
 #endif
 
+#ifdef __MINGW32__
+#include "mingw32.h"
+#if STD_MINGW
+#include <winsock.h>
+#endif
+#endif
+
 void
 __gnat_timeval_to_duration (struct timeval *t, long *sec, long *usec)
 {
@@ -89,7 +94,7 @@ __gnat_duration_to_timeval (long sec, long usec, struct timeval *t)
    what time_t is on the target.  */
 
 long
-gnat_time ()
+gnat_time (void)
 {
   return time (0);
 }