From 9b004cd378134e48c62af86c65d5d8ba4c657d0a Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Thu, 9 Jul 2015 17:06:00 +0200 Subject: [PATCH] getruntime.c (RUSAGE_SELF): Define if not already defined. * getruntime.c (RUSAGE_SELF): Define if not already defined. (get_runtime): Use RUSAGE_SELF as argument 1 of getrusage call. From-SVN: r225614 --- libiberty/ChangeLog | 6 +++--- libiberty/getruntime.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 643d04ea265..5d009cc8468 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,7 +1,7 @@ -2015-07-08 Uros Bizjak +2015-07-09 Uros Bizjak - * getruntime.c (get_run_time) [__USE_GNU]: Use RUSAGE_SELF as - argument 1 of getrusage call. + * getruntime.c (RUSAGE_SELF): Define if not already defined. + (get_runtime): Use RUSAGE_SELF as argument 1 of getrusage call. 2015-06-01 Jason Merrill diff --git a/libiberty/getruntime.c b/libiberty/getruntime.c index 9d5eed19116..1e0daad19ac 100644 --- a/libiberty/getruntime.c +++ b/libiberty/getruntime.c @@ -65,6 +65,10 @@ Boston, MA 02110-1301, USA. */ #define CLOCKS_PER_SEC 1 #endif +#ifndef RUSAGE_SELF +#define RUSAGE_SELF 0 +#endif + #ifdef _SC_CLK_TCK #define GNU_HZ sysconf(_SC_CLK_TCK) #else @@ -95,11 +99,7 @@ get_run_time (void) #if defined (HAVE_GETRUSAGE) && defined (HAVE_SYS_RESOURCE_H) struct rusage rusage; -#if defined __USE_GNU && !defined __cplusplus getrusage (RUSAGE_SELF, &rusage); -#else - getrusage (0, &rusage); -#endif return (rusage.ru_utime.tv_sec * 1000000 + rusage.ru_utime.tv_usec + rusage.ru_stime.tv_sec * 1000000 + rusage.ru_stime.tv_usec); #else /* ! HAVE_GETRUSAGE */