diff options
| author | Filippos Karapetis | 2010-11-28 22:12:11 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-11-28 22:12:11 +0000 |
| commit | 626e9413fdca6a9e1d8141945a0e419d0a91f4d1 (patch) | |
| tree | c7137a3d28714aae7f47f9a9324531261cb5421d /common | |
| parent | 460a65d2aa78df5528ab54d1d3eb9afde0a10355 (diff) | |
| download | scummvm-rg350-626e9413fdca6a9e1d8141945a0e419d0a91f4d1.tar.gz scummvm-rg350-626e9413fdca6a9e1d8141945a0e419d0a91f4d1.tar.bz2 scummvm-rg350-626e9413fdca6a9e1d8141945a0e419d0a91f4d1.zip | |
AmigaOS: Fixed compilation after the latest GSoC code merging (bug #3121350)
svn-id: r54555
Diffstat (limited to 'common')
| -rw-r--r-- | common/keyboard.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/common/keyboard.h b/common/keyboard.h index 8f93fed91c..40491fda6b 100644 --- a/common/keyboard.h +++ b/common/keyboard.h @@ -28,6 +28,15 @@ #include "common/scummsys.h" +#if defined(__amigaos4__) +// KEYCODE_LESS and KEYCODE_GREATER are already defined in AmigaOS, inside +// include/include_h/intuition/intuition.h (bug #3121350) +#if defined(KEYCODE_LESS) && defined(KEYCODE_GREATER) +#undef KEYCODE_LESS +#undef KEYCODE_GREATER +#endif +#endif + namespace Common { enum KeyCode { |