[rtems commit] sptests/spstkalloc02: Fix namespace issue

Sebastian Huber sebh at rtems.org
Mon Apr 27 08:32:55 UTC 2015


Module:    rtems
Branch:    master
Commit:    40d24d54ab59fdb2e4133128bf184ec8935f3545
Changeset: http://git.rtems.org/rtems/commit/?id=40d24d54ab59fdb2e4133128bf184ec8935f3545

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Sun Apr 26 20:26:50 2015 +0200

sptests/spstkalloc02: Fix namespace issue

Avoid collision with <sys/param.h> defined PAGE_SIZE.

---

 testsuites/sptests/spstkalloc02/init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c
index a01bc5c..9ea5db7 100644
--- a/testsuites/sptests/spstkalloc02/init.c
+++ b/testsuites/sptests/spstkalloc02/init.c
@@ -35,7 +35,7 @@ const char rtems_test_name[] = "SPSTKALLOC 2";
 
 #define TASK_COUNT 5
 
-#define PAGE_SIZE 1024
+#define STACK_HEAP_PAGE_SIZE 1024
 
 static Heap_Control task_stack_heap;
 
@@ -127,7 +127,7 @@ static rtems_task Init(rtems_task_argument argument)
 #define CONFIGURE_TASK_STACK_DEALLOCATOR task_stack_free
 #define CONFIGURE_TASK_STACK_ALLOCATOR_AVOIDS_WORK_SPACE
 #define CONFIGURE_TASK_STACK_FROM_ALLOCATOR(stack_size) \
-  ((stack_size) + HEAP_BLOCK_HEADER_SIZE + PAGE_SIZE - 1)
+  ((stack_size) + HEAP_BLOCK_HEADER_SIZE + STACK_HEAP_PAGE_SIZE - 1)
 
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
@@ -146,7 +146,7 @@ static void task_stack_init(size_t stack_space_size)
     &task_stack_heap,
     task_stack_space,
     sizeof(task_stack_space),
-    PAGE_SIZE
+    STACK_HEAP_PAGE_SIZE
   );
 
   rtems_test_assert(stack_space_size == CONFIGURE_STACK_SPACE_SIZE);




More information about the vc mailing list