Changeset 21804 for branches/gcc-kmk/src/kernel32/conbuffervio.cpp

Timestamp:

Nov 14, 2011, 8:13:20 PM (14 years ago)

Author:

dmik

Message:

Define USE_OS2_TOOLKIT_HEADERS.

This is necessary since some APIs used by Odin are missing from the somewhat
restricted version of the OS/2 Toolkit that comes with GCC.

File:

• branches/gcc-kmk/src/kernel32/conbuffervio.cpp (modified) (1 diff)

branches/gcc-kmk/src/kernel32/conbuffervio.cpp

@@ -53 +53 @@
  * Includes                                                                  *
  *****************************************************************************/
+
+// Vio/Kbd/Mou declarations conflict in GCC and in real OS2TK headers;
+// force GCC declarations since we link against GCC libs
+#if defined (__EMX__) && defined (USE_OS2_TOOLKIT_HEADERS)
+#undef USE_OS2_TOOLKIT_HEADERS
+#endif
 
 #define  INCL_WIN