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

	PR 1661/testing
	* spfifo02/init.c, spmountmgr01/init.c, spprivenv01/init.c: Eliminate
	most references to RTEMS_Malloc_Heap.

1 files changed, 4 insertions, 7 deletions

diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c
index 3752088bd8..af92bef271 100644
--- a/testsuites/sptests/spprivenv01/init.c
+++ b/testsuites/sptests/spprivenv01/init.c
@@ -11,10 +11,8 @@
 
 #include <tmacros.h>
 #include "test_support.h"
-#include <rtems/score/heap.h>
 #include <rtems/libio_.h>
-
-extern Heap_Control  *RTEMS_Malloc_Heap;
+#include <rtems/libcsupport.h>
 
 rtems_task task_routine( rtems_task_argument not_used )
 {
@@ -35,16 +33,15 @@ rtems_task Init(
   int sc = 0;
   bool status = 0;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
   rtems_id current_task_id;
   rtems_id task_id;
   rtems_name another_task_name;
-
+  Heap_Information_block  Info;
+  
   puts( "\n\n*** TEST USER ENVIRONMENT ROUTINE - 01 ***" );
 
   puts( "Init - allocating most of heap -- OK" );
-  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
-  alloc_ptr = malloc( Info.Free.largest - 4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
   rtems_test_assert( alloc_ptr != NULL );
 
   puts( "Init - attempt to reset env - expect RTEMS_NO_MEMORY" );