diff options
| author | Chris Johns <chrisj@rtems.org> | 2009-06-15 01:02:18 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2009-06-15 01:02:18 +0000 |
| commit | 6576c1d7ea057a0477c52f4989fc89e369af4c9a (patch) | |
| tree | 3a207b1a6f744f07c6eee5198e1a39832d6346e0 | |
| parent | Fixed nested includes. (diff) | |
| download | rtems-6576c1d7ea057a0477c52f4989fc89e369af4c9a.tar.bz2 | |
2009-06-15 Chris Johns <chrisj@rtems.org>
* libmisc/shell/hexdump-odsyntax.c: AVR has the same size float
and double. Fix error in case statement.
* libmisc/shell/main_dd.c: Remove sys/conf.h header. It is not
available if networking is disabled.
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/hexdump-odsyntax.c | 2 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_dd.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index dfda94f35a..20c9d4a3a0 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,12 @@ 2009-06-15 Chris Johns <chrisj@rtems.org> + * libmisc/shell/hexdump-odsyntax.c: AVR has the same size float + and double. Fix error in case statement. + * libmisc/shell/main_dd.c: Remove sys/conf.h header. It is not + available if networking is disabled. + +2009-06-15 Chris Johns <chrisj@rtems.org> + * score/cpu/mips/rtems/mips/idtcpu.h: Remote WAIT define. Horrible overload. diff --git a/cpukit/libmisc/shell/hexdump-odsyntax.c b/cpukit/libmisc/shell/hexdump-odsyntax.c index db67ae53e9..5fba463b5c 100644 --- a/cpukit/libmisc/shell/hexdump-odsyntax.c +++ b/cpukit/libmisc/shell/hexdump-odsyntax.c @@ -353,9 +353,11 @@ odformatfp(rtems_shell_hexdump_globals* globals, char fchar __unused, const char case sizeof(float): digits = FLT_DIG; break; +#if !defined(__AVR__) case sizeof(double): digits = DBL_DIG; break; +#endif default: if (isize == sizeof(long double)) digits = LDBL_DIG; diff --git a/cpukit/libmisc/shell/main_dd.c b/cpukit/libmisc/shell/main_dd.c index 1f08a8373a..98d69811f9 100644 --- a/cpukit/libmisc/shell/main_dd.c +++ b/cpukit/libmisc/shell/main_dd.c @@ -51,8 +51,8 @@ __FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $"); #include <sys/param.h> #include <sys/stat.h> -#include <sys/conf.h> #if RTEMS_REMOVED +#include <sys/conf.h> #include <sys/disklabel.h> #endif #include <sys/filio.h> |