diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-12-20 16:49:52 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-12-20 16:49:52 +0000 |
| commit | 881d0ac4865a3b4b49c8b233e916732346a193cb (patch) | |
| tree | 20ac0bd70cbcd41be3e934e9d30df275f596b7f3 | |
| parent | 3dd9c59dbeb5b2598838cff0018d4f07fd2c67ec (diff) | |
| parent | 237ec692ddb58d41a12dffc12b31914252391209 (diff) | |
| download | netsurf-881d0ac4865a3b4b49c8b233e916732346a193cb.tar.gz | |
Merge remote-tracking branch 'origin/master' into chris/splay
| -rw-r--r-- | amiga/gui.c | 2 | ||||
| -rw-r--r-- | amiga/os3support.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index fe1038561..5eab34578 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5532,7 +5532,7 @@ int main(int argc, char** argv) len += strlen(users_dir); len += 2; /* for poss path sep and NULL term */ - current_user_dir = AllocVecTags(len, NULL); + current_user_dir = AllocVecTagList(len, NULL); if(current_user_dir == NULL) { ami_misc_fatal_error("Failed to allocate memory"); ami_scheduler_process_delete(); diff --git a/amiga/os3support.h b/amiga/os3support.h index dddedb7ff..553dcb24a 100644 --- a/amiga/os3support.h +++ b/amiga/os3support.h @@ -100,6 +100,9 @@ #define RAWKEY_CRSRRIGHT 0x4E #define RAWKEY_CRSRLEFT 0x4F #define RAWKEY_F5 0x54 +#define RAWKEY_F8 0x57 +#define RAWKEY_F9 0x58 +#define RAWKEY_F10 0x59 #define RAWKEY_HELP 0x5F #define RAWKEY_HOME 0x70 #define RAWKEY_END 0x71 |