From: Chris Johns <chr...@rtems.org>
Updates #6442
---
cpukit/libmd/md5.c | 2 +-
cpukit/libmisc/shell/hexdump-conv.c | 4 ++++
cpukit/libmisc/shell/main_edit.c | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/cpukit/libmd/md5.c b/cpukit/libmd/md5.c
index 4c909f37a0..5e3a100c7b 100644
--- a/cpukit/libmd/md5.c
+++ b/cpukit/libmd/md5.c
@@ -165,7 +165,7 @@ void MD5Update (
ends with the desired message digest in mdContext->digest[0...15].
*/
void MD5Final (
- unsigned char hash[],
+ unsigned char hash[16],
MD5_CTX *mdContext )
{
UINT4 in[16];
diff --git a/cpukit/libmisc/shell/hexdump-conv.c
b/cpukit/libmisc/shell/hexdump-conv.c
index aa16f9b169..24b28353f3 100644
--- a/cpukit/libmisc/shell/hexdump-conv.c
+++ b/cpukit/libmisc/shell/hexdump-conv.c
@@ -117,7 +117,11 @@ retry:
if (clen == 0)
clen = 1;
else if (clen == (size_t)-1 || (clen == (size_t)-2 &&
+#ifndef __rtems__
buf == peekbuf)) {
+#else /* __rtems__ */
+ &buf[0] == &peekbuf[0])) {
+#endif /* __rtems__ */
memset(&pr->mbstate, 0, sizeof(pr->mbstate));
wc = *p;
clen = 1;
diff --git a/cpukit/libmisc/shell/main_edit.c b/cpukit/libmisc/shell/main_edit.c
index ed1371f7fa..4cc742719a 100644
--- a/cpukit/libmisc/shell/main_edit.c
+++ b/cpukit/libmisc/shell/main_edit.c
@@ -55,7 +55,9 @@
#if defined(__linux__) || defined(__rtems__)
#include <sys/ioctl.h>
#include <termios.h>
+#ifndef O_BINARY
#define O_BINARY 0
+#endif
static int linux_console;
#endif
--
2.19.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
