summaryrefslogtreecommitdiffstats
path: root/testsuites/samples/iostream
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2010-06-02 00:47:15 +0000
committerChris Johns <chrisj@rtems.org>2010-06-02 00:47:15 +0000
commit558a5f48fc8295dcb51735ffa1c841ac9ab67d23 (patch)
tree3ad3d8c8ae16a7bd241b4992f0227387bc6e71bd /testsuites/samples/iostream
parent2010-06-01 Chris Johns <chrisj@rtems.org> (diff)
downloadrtems-558a5f48fc8295dcb51735ffa1c841ac9ab67d23.tar.bz2
2010-06-02 Chris Johns <chrisj@rtems.org>
* fileio/init.c: Update to new mount API. * iostream/init.cc: Hack to work around confdefs.h in C++. * iostream/system.h: Add comment about base miniIMFS.
Diffstat (limited to 'testsuites/samples/iostream')
-rw-r--r--testsuites/samples/iostream/init.cc4
-rw-r--r--testsuites/samples/iostream/system.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/testsuites/samples/iostream/init.cc b/testsuites/samples/iostream/init.cc
index 26fb7b754b..2f0e3944f8 100644
--- a/testsuites/samples/iostream/init.cc
+++ b/testsuites/samples/iostream/init.cc
@@ -20,8 +20,11 @@
* $Id$
*/
+extern "C" {
+
#define CONFIGURE_INIT
#include "system.h"
+}
#if BSP_SMALL_MEMORY
#include <stdio.h>
@@ -31,6 +34,7 @@
#include <stdlib.h>
+
rtems_task Init(
rtems_task_argument ignored
)
diff --git a/testsuites/samples/iostream/system.h b/testsuites/samples/iostream/system.h
index d1033b5f51..4c4ab16582 100644
--- a/testsuites/samples/iostream/system.h
+++ b/testsuites/samples/iostream/system.h
@@ -32,6 +32,7 @@
#define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2)
#define CONFIGURE_EXTRA_TASK_STACKS RTEMS_MINIMUM_STACK_SIZE
+/* Only remove when this macro is removed from confdefs.h. It tests it. */
#define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
#include <rtems/confdefs.h>