2009-08-24 Steven G. Kargl <kargl@gcc.gnu.org>

[pf3gnuchains/gcc-fork.git] / libgfortran / intrinsics / time_1.h

diff --git a/libgfortran/intrinsics/time_1.h b/libgfortran/intrinsics/time_1.h
index 43e6d89..03e14ed 100644 (file)
--- a/libgfortran/intrinsics/time_1.h
+++ b/libgfortran/intrinsics/time_1.h
@@ -1,31 +1,26 @@
 /* Implementation of the CPU_TIME intrinsic.
-   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2009 Free Software Foundation, Inc.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
 
 Libgfortran is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
+version 3 of the License, or (at your option) any later version.
 
 Libgfortran is distributed in the hope that it will be useful,
 but WITHOUT 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 along with libgfortran; see the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+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/>.  */
 
 #ifndef LIBGFORTRAN_TIME_H
 #define LIBGFORTRAN_TIME_H
@@ -56,6 +51,10 @@ Boston, MA 02110-1301, USA.  */
 #  endif
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+     #include <sys/types.h>
+#endif
+
 /* The most accurate way to get the CPU time is getrusage (). */
 #if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H)
 #  include <sys/resource.h>
@@ -87,7 +86,6 @@ __time_1 (long *user_sec, long *user_usec, long *system_sec, long *system_usec)
   } kernel_time,  user_time;
 
   FILETIME unused1, unused2;
-  unsigned long long total_time;
 
   /* No support for Win9x.  The high order bit of the DWORD
      returned by GetVersion is 0 for NT and higher. */
@@ -104,10 +102,10 @@ __time_1 (long *user_sec, long *user_usec, long *system_sec, long *system_usec)
                   &kernel_time.ft, &user_time.ft);
 
   *user_sec = user_time.ulltime / 10000000;
-  *user_usec = user_time.ulltime % 10000000;
+  *user_usec = (user_time.ulltime % 10000000) / 10;
 
   *system_sec = kernel_time.ulltime / 10000000;
-  *system_usec = kernel_time.ulltime % 10000000;
+  *system_usec = (kernel_time.ulltime % 10000000) / 10;
   return 0;
 }
 
@@ -118,7 +116,7 @@ __time_1 (long *user_sec, long *user_usec, long *system_sec, long *system_usec)
 {
 #if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H)
   struct rusage usage;
-  getrusage (0, &usage);
+  getrusage (RUSAGE_SELF, &usage);
 
   *user_sec = usage.ru_utime.tv_sec;
   *user_usec = usage.ru_utime.tv_usec;