2010-08-09 Joel Sherrill <joel.sherrill@oarcorp.com>

	PR 1661/testing
	* psxchroot01/test.c, psximfs01/init.c, psximfs02/init.c,
	psxpipe01/init.c: Eliminate most references to RTEMS_Malloc_Heap.

1 files changed, 2 insertions, 5 deletions

diff --git a/testsuites/psxtests/psximfs01/init.c b/testsuites/psxtests/psximfs01/init.c
index 8ca65bb0c7..cafac02701 100644
--- a/testsuites/psxtests/psximfs01/init.c
+++ b/testsuites/psxtests/psximfs01/init.c
@@ -17,6 +17,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <rtems/libcsupport.h>
 
 int TestFd;
 uint8_t Buffer[256];
@@ -207,15 +208,12 @@ void unlink_it(void)
   rtems_test_assert( rc == 0 );
 }
 
-extern Heap_Control  *RTEMS_Malloc_Heap;
-
 rtems_task Init(
   rtems_task_argument argument
 )
 {
   int i;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
   int position = 0;
   int status = 0;
 
@@ -240,8 +238,7 @@ rtems_task Init(
   /*
    * Allocate the heap, so that extend cannot be successful
    */
-  _Heap_Get_information( RTEMS_Malloc_Heap, &Info );
-  alloc_ptr = malloc( Info.Free.largest-4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
 
   extend_helper();