[Scummvm-cvs-logs] SF.net SVN: scummvm:[54555] scummvm/trunk/common/keyboard.h

[thebluegr at users.sourceforge.net]

Revision: 54555
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54555&view=rev
Author:   thebluegr
Date:     2010-11-28 22:12:11 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
AmigaOS: Fixed compilation after the latest GSoC code merging (bug #3121350)

Modified Paths:
--------------
    scummvm/trunk/common/keyboard.h

Modified: scummvm/trunk/common/keyboard.h
===================================================================
--- scummvm/trunk/common/keyboard.h	2010-11-28 22:05:05 UTC (rev 54554)
+++ scummvm/trunk/common/keyboard.h	2010-11-28 22:12:11 UTC (rev 54555)
@@ -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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.