From 4b2746331189715bb668299fa6d7f5108b31bcce Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 13 Dec 2011 06:52:09 +0000
Subject: =?UTF-8?q?2011-12-13=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* configure.ac: Check for getrusage decl.
	* psxgetrusage01/init.c:
	Fix header file inclusion order.
	Move configuration section up.
	Apply HAVE_DECL_GETRUSAGE.
---
 testsuites/psxtests/ChangeLog             |  8 +++++++
 testsuites/psxtests/configure.ac          |  3 +++
 testsuites/psxtests/psxgetrusage01/init.c | 35 ++++++++++++++++---------------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog
index a0493648de..4f1ab4f5b3 100644
--- a/testsuites/psxtests/ChangeLog
+++ b/testsuites/psxtests/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-13	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure.ac: Check for getrusage decl.
+	* psxgetrusage01/init.c:
+	Fix header file inclusion order.
+	Move configuration section up.
+	Apply HAVE_DECL_GETRUSAGE.
+
 2011-12-09	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* psxconfig01/init.c: Fix due to alignment issue.
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index e438b05d35..858867d9a3 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -50,6 +50,9 @@ AC_CHECK_DECLS([pthread_attr_getguardsize],[],[],[[#include <pthread.h>]])
 # Added to pthreads after initial revision.  May not be in toolset
 AC_CHECK_DECLS([pthread_attr_setguardsize],[],[],[[#include <pthread.h>]])
 
+# Mandated by POSIX, not declared in some versions of newlib.
+AC_CHECK_DECLS([getrusage],,,[#include sys/resource.h])
+
 # FIXME: adjtime is a non-standardized BSD/Linux extension
 # RTEMS should not rely on adjtime
 AC_CHECK_DECLS([adjtime],[],[],[[#include <sys/time.h>]])
diff --git a/testsuites/psxtests/psxgetrusage01/init.c b/testsuites/psxtests/psxgetrusage01/init.c
index b488e65183..a97c71ab75 100644
--- a/testsuites/psxtests/psxgetrusage01/init.c
+++ b/testsuites/psxtests/psxgetrusage01/init.c
@@ -13,14 +13,28 @@
 #include "config.h"
 #endif
 
-#include <tmacros.h>
-#include "test_support.h"
-
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <errno.h>
 
-int getrusage(int who, struct rusage *usage);
+#if !HAVE_DECL_GETRUSAGE
+extern int getrusage(int who, struct rusage *usage);
+#endif
+
+#include <tmacros.h>
+#include "test_support.h"
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS             1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
 
 rtems_task Init(
   rtems_task_argument argument
@@ -65,16 +79,3 @@ rtems_task Init(
 
   rtems_test_exit(0);
 }
-
-/* configuration information */
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS             1
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_INIT
-
-#include <rtems/confdefs.h>
-/* end of file */
-- 
cgit v1.2.3