summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--c/src/tests/samples/ChangeLog5
-rw-r--r--c/src/tests/samples/fileio/init.c4
-rw-r--r--testsuites/samples/ChangeLog5
-rw-r--r--testsuites/samples/fileio/init.c4
4 files changed, 10 insertions, 8 deletions
diff --git a/c/src/tests/samples/ChangeLog b/c/src/tests/samples/ChangeLog
index aebec455f9..fc01726558 100644
--- a/c/src/tests/samples/ChangeLog
+++ b/c/src/tests/samples/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * fileio/init.c: Unconditionally define MIN (We *do want* to see
+ error messages if it conflicts).
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* README, base_mp/apptask.c, base_mp/init.c, base_mp/system.h,
diff --git a/c/src/tests/samples/fileio/init.c b/c/src/tests/samples/fileio/init.c
index abd6398d4e..1cb82a011d 100644
--- a/c/src/tests/samples/fileio/init.c
+++ b/c/src/tests/samples/fileio/init.c
@@ -92,9 +92,7 @@ fstab_t fs_table[] = {
}
};
-#ifndef MIN
#define MIN(a,b) (((a) > (b)) ? (b) : (a))
-#endif
#define USE_SHELL
@@ -596,5 +594,3 @@ Init (rtems_task_argument ignored)
fileio_menu();
}
-
-
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog
index aebec455f9..fc01726558 100644
--- a/testsuites/samples/ChangeLog
+++ b/testsuites/samples/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * fileio/init.c: Unconditionally define MIN (We *do want* to see
+ error messages if it conflicts).
+
2003-09-04 Joel Sherrill <joel@OARcorp.com>
* README, base_mp/apptask.c, base_mp/init.c, base_mp/system.h,
diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c
index abd6398d4e..1cb82a011d 100644
--- a/testsuites/samples/fileio/init.c
+++ b/testsuites/samples/fileio/init.c
@@ -92,9 +92,7 @@ fstab_t fs_table[] = {
}
};
-#ifndef MIN
#define MIN(a,b) (((a) > (b)) ? (b) : (a))
-#endif
#define USE_SHELL
@@ -596,5 +594,3 @@ Init (rtems_task_argument ignored)
fileio_menu();
}
-
-