-Wshadow sh fix from Jeff Garzik

[oweals/busybox.git] / shell / cmdedit.h

diff --git a/shell/cmdedit.h b/shell/cmdedit.h
index b621ae8ec88932e2a56931202b2dd7de62f32d07..0ab94c6cec6458802f5e62a0b0a9206a96d16570 100644 (file)
--- a/shell/cmdedit.h
+++ b/shell/cmdedit.h
@@ -1,37 +1,14 @@
 #ifndef CMDEDIT_H
 #define CMDEDIT_H
 
-/* unix systems can #define POSIX to use termios, otherwise 
- * the bsd or sysv interface will be used 
- */
-
-#ifdef __STDC__ 
+#ifdef BB_FEATURE_COMMAND_EDITING
 #include <stddef.h>
-
-typedef size_t (*cmdedit_strwidth_proc)(char *);
+#include "busybox.h"
 
 void cmdedit_init(void);
+void cmdedit_terminate(void);
 void cmdedit_read_input(char* promptStr, char* command);               /* read a line of input */
-void cmdedit_setwidth(int);            /* specify width of screen */
-void cmdedit_histadd(char *);          /* adds entries to hist */
-void cmdedit_strwidth(cmdedit_strwidth_proc);  /* to bind cmdedit_strlen */
-
-extern int     (*cmdedit_in_hook)(char *);
-extern int     (*cmdedit_out_hook)(char *);
-extern int     (*cmdedit_tab_hook)(char *, int, int *);
-
-#else  /* not __STDC__ */
-
-void cmdedit_init(void);
-void cmdedit_read_input(char* promptStr, char* command);
-void cmdedit_setwidth();
-void cmdedit_histadd();
-void cmdedit_strwidth();
-
-extern int     (*cmdedit_in_hook)();
-extern int     (*cmdedit_out_hook)();
-extern int     (*cmdedit_tab_hook)();
 
-#endif /* __STDC__ */
+#endif /* BB_FEATURE_COMMAND_EDITING */
 
 #endif /* CMDEDIT_H */