diff --git a/ChangeLog b/ChangeLog index 42fb0ae1..30924257 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-02-26 Chris Allegretta + * Change RAW in function_type enum to RAWINPUT, to fix compilation on AIX, + reported by Richard G Daniel . + 2011-02-23 Chris Allegretta * Fix some more severe warnings from 'g++ -pedantic', from patch originally by Eitan Adler diff --git a/src/global.c b/src/global.c index 9889072d..b5e868d8 100644 --- a/src/global.c +++ b/src/global.c @@ -269,7 +269,7 @@ function_type strtokeytype(const char *str) else if (str[0] == 'F' || str[0] == 'F') return FKEY; else - return RAW; + return RAWINPUT; } /* Add a string to the new function list strict. @@ -398,7 +398,7 @@ void assign_keyinfo(sc *s) } else if (s->type == FKEY) { assert(strlen(s->keystr) > 1); s->seq = KEY_F0 + atoi(&s->keystr[1]); - } else /* raw */ + } else /* RAWINPUT */ s->seq = (int) s->keystr[0]; /* Override some keys which don't bind as nicely as we'd like */ @@ -406,32 +406,32 @@ void assign_keyinfo(sc *s) s->seq = 0; else if (s->type == META && (!strcasecmp(&s->keystr[2], "space"))) s->seq = (int) ' '; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kup"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kup"))) s->seq = KEY_UP; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kdown"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kdown"))) s->seq = KEY_DOWN; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kleft"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kleft"))) s->seq = KEY_LEFT; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kright"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kright"))) s->seq = KEY_RIGHT; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kinsert"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kinsert"))) s->seq = KEY_IC; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kdel"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kdel"))) s->seq = KEY_DC; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kbsp"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kbsp"))) s->seq = KEY_BACKSPACE; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kenter"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kenter"))) s->seq = KEY_ENTER; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kpup"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kpup"))) s->seq = KEY_PPAGE; - else if (s->type == RAW && (!strcasecmp(s->keystr, "kpdown"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kpdown"))) s->seq = KEY_NPAGE; #ifdef KEY_HOME - else if (s->type == RAW && (!strcasecmp(s->keystr, "khome"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "khome"))) s->seq = KEY_HOME; #endif #ifdef KEY_END - else if (s->type == RAW && (!strcasecmp(s->keystr, "kend"))) + else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kend"))) s->seq = KEY_END; #endif diff --git a/src/help.c b/src/help.c index d97fb44f..5cbfed4f 100644 --- a/src/help.c +++ b/src/help.c @@ -446,7 +446,7 @@ void help_init(void) if (scsfound == 3) continue; - if (s->type == RAW) + if (s->type == RAWINPUT) continue; if ((s->menu & currmenu) == 0) diff --git a/src/nano.h b/src/nano.h index f5ee1ef5..25ee321e 100644 --- a/src/nano.h +++ b/src/nano.h @@ -182,7 +182,7 @@ typedef enum { } update_type; typedef enum { - CONTROL, META, FKEY, RAW + CONTROL, META, FKEY, RAWINPUT } function_type; typedef enum {