summaryrefslogtreecommitdiff
path: root/cmd-line-utils/libedit/key.h
diff options
context:
space:
mode:
Diffstat (limited to 'cmd-line-utils/libedit/key.h')
-rw-r--r--cmd-line-utils/libedit/key.h37
1 files changed, 18 insertions, 19 deletions
diff --git a/cmd-line-utils/libedit/key.h b/cmd-line-utils/libedit/key.h
index 9d83d7c2521..39a075c504e 100644
--- a/cmd-line-utils/libedit/key.h
+++ b/cmd-line-utils/libedit/key.h
@@ -1,4 +1,4 @@
-/* $NetBSD: key.h,v 1.6 2002/03/18 16:00:55 christos Exp $ */
+/* $NetBSD: key.h,v 1.8 2003/08/07 16:44:32 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -62,19 +58,22 @@ typedef struct el_key_t {
#define XK_NOD 2
#define XK_EXE 3
-protected int el_key_init(EditLine *);
-protected void el_key_end(EditLine *);
-protected key_value_t *el_key_map_cmd(EditLine *, int);
-protected key_value_t *el_key_map_str(EditLine *, char *);
-protected void el_key_reset(EditLine *);
-protected int el_key_get(EditLine *, char *, key_value_t *);
-protected void el_key_add(EditLine *,
- const char *, key_value_t *, int);
-protected void el_key_clear(EditLine *, el_action_t *, const char *);
-protected int el_key_delete(EditLine *, const char *);
-protected void el_key_print(EditLine *, const char *);
-protected void el_key_kprint(EditLine *, const char *, key_value_t *,
+#undef key_end
+#undef key_clear
+#undef key_print
+
+protected int key_init(EditLine *);
+protected void key_end(EditLine *);
+protected key_value_t *key_map_cmd(EditLine *, int);
+protected key_value_t *key_map_str(EditLine *, char *);
+protected void key_reset(EditLine *);
+protected int key_get(EditLine *, char *, key_value_t *);
+protected void key_add(EditLine *, const char *, key_value_t *, int);
+protected void key_clear(EditLine *, el_action_t *, const char *);
+protected int key_delete(EditLine *, const char *);
+protected void key_print(EditLine *, const char *);
+protected void key_kprint(EditLine *, const char *, key_value_t *,
int);
-protected char *el_key__decode_str(const char *, char *, const char *);
+protected char *key__decode_str(const char *, char *, const char *);
#endif /* _h_el_key */