summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorJennifer Averett <Jennifer.Averett@OARcorp.com>2011-10-18 18:19:36 +0000
committerJennifer Averett <Jennifer.Averett@OARcorp.com>2011-10-18 18:19:36 +0000
commit4ec81807a160e7a9bb8aebf5104458b1826f3586 (patch)
treecebfd20f29eea2c5103d2d7b12fc021de4551e86 /testsuites
parent2011-10-18 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-4ec81807a160e7a9bb8aebf5104458b1826f3586.tar.bz2
2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com
* mrfs_support/fs_support.c: Resolved name conflict that was causing a compiler error.
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/fstests/ChangeLog5
-rw-r--r--testsuites/fstests/mrfs_support/fs_support.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/testsuites/fstests/ChangeLog b/testsuites/fstests/ChangeLog
index 80743fb48b..81b4a2c55a 100644
--- a/testsuites/fstests/ChangeLog
+++ b/testsuites/fstests/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com
+
+ * mrfs_support/fs_support.c: Resolved name conflict that was causing a
+ compiler error.
+
2011-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* fsrdwr/init.c: Use %zd to print size_t.
diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c
index a045d312e9..ca779aa3fd 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -26,7 +26,7 @@
#define BLOCK_SIZE (512)
-rtems_rfs_format_config config = {
+rtems_rfs_format_config rfs_config = {
block_size:BLOCK_SIZE
};
@@ -40,7 +40,7 @@ test_initialize_filesystem (void)
init_ramdisk ();
- rc = rtems_rfs_format (RAMDISK_PATH, &config);
+ rc = rtems_rfs_format (RAMDISK_PATH, &rfs_config);
rtems_test_assert (rc == 0);
rc = mount (RAMDISK_PATH,