diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-30 05:05:30 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-30 05:05:30 +0000 |
| commit | c92b69c3405f06317fc7ea78198fccbf666541f1 (patch) | |
| tree | eda4f6638fb40a8b7a90fba12b45aace2a5d5deb /cpukit | |
| parent | 2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-c92b69c3405f06317fc7ea78198fccbf666541f1.tar.bz2 | |
2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* libcsupport/src/__assert.c: Rework autoconf defines.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 1 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/__assert.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ec5185c8e3..2ef7126ede 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,6 @@ 2009-09-30 Ralf Corsépius <ralf.corsepius@rtems.org> + * libcsupport/src/__assert.c: Rework autoconf defines. * libcsupport/src/__brk.c: Eliminate RTEMS_UNIX. Remove unused includes. * libcsupport/src/getgroups.c: Remove unused includes. diff --git a/cpukit/libcsupport/src/__assert.c b/cpukit/libcsupport/src/__assert.c index 7612ba44b4..3d4af56e53 100644 --- a/cpukit/libcsupport/src/__assert.c +++ b/cpukit/libcsupport/src/__assert.c @@ -17,7 +17,7 @@ #include <rtems/bspIo.h> #include <rtems.h> - +#if defined(RTEMS_NEWLIB) && !defined(HAVE___ASSERT_FUNC) /* * Newlib 1.16.0 added this method. Together these provide an * RTEMS safe, low memory implementation. @@ -38,8 +38,9 @@ void __assert_func( ); rtems_fatal_error_occurred(0); } +#endif -#ifndef HAVE___ASSERT +#if defined(RTEMS_NEWLIB) && !defined(HAVE___ASSERT) void __assert( const char *file, int line, |