summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/libedit/readline/readline.h2
-rw-r--r--cmd-line-utils/libedit/vi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd-line-utils/libedit/readline/readline.h b/cmd-line-utils/libedit/readline/readline.h
index 902179c208a..c43f71fb51d 100644
--- a/cmd-line-utils/libedit/readline/readline.h
+++ b/cmd-line-utils/libedit/readline/readline.h
@@ -73,7 +73,7 @@ typedef KEYMAP_ENTRY *Keymap;
#ifndef CTRL
#include <sys/ioctl.h>
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__MWERKS__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff --git a/cmd-line-utils/libedit/vi.c b/cmd-line-utils/libedit/vi.c
index 4a0352859dd..b977ce716c6 100644
--- a/cmd-line-utils/libedit/vi.c
+++ b/cmd-line-utils/libedit/vi.c
@@ -1014,7 +1014,7 @@ vi_histedit(EditLine *el, int c)
return CC_ERROR;
case 0:
close(fd);
- execlp("vi", "vi", tempfile, 0);
+ execlp("vi", "vi", tempfile, (char *) NULL);
exit(0);
/*NOTREACHED*/
default: