Changeset 21804 for branches/gcc-kmk/src


Ignore:
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.

Location:
branches/gcc-kmk/src/kernel32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/src/kernel32/conbuffer.cpp

    r21302 r21804  
    5353 * Includes                                                                  *
    5454 *****************************************************************************/
     55
     56// Vio/Kbd/Mou declarations conflict in GCC and in real OS2TK headers;
     57// force GCC declarations since we link against GCC libs
     58#if defined (__EMX__) && defined (USE_OS2_TOOLKIT_HEADERS)
     59#undef USE_OS2_TOOLKIT_HEADERS
     60#endif
    5561
    5662#define  INCL_WIN

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

    r10010 r21804  
    5353 * Includes                                                                  *
    5454 *****************************************************************************/
     55
     56// Vio/Kbd/Mou declarations conflict in GCC and in real OS2TK headers;
     57// force GCC declarations since we link against GCC libs
     58#if defined (__EMX__) && defined (USE_OS2_TOOLKIT_HEADERS)
     59#undef USE_OS2_TOOLKIT_HEADERS
     60#endif
    5561
    5662#define  INCL_WIN

  • branches/gcc-kmk/src/kernel32/console.cpp

    r21755 r21804  
    5353*   Header Files                                                               *
    5454*******************************************************************************/
    55 #include <process.h>
    56 #include <stdlib.h>
    57 #include <string.h>
     55
     56// Vio/Kbd/Mou declarations conflict in GCC and in real OS2TK headers;
     57// force GCC declarations since we link against GCC libs
     58#if defined (__EMX__) && defined (USE_OS2_TOOLKIT_HEADERS)
     59#undef USE_OS2_TOOLKIT_HEADERS
     60#endif
    5861
    5962#define  INCL_WIN
    … …  
    6972#define  INCL_AVIO
    7073#include <os2wrap.h>         //Odin32 OS/2 api wrappers
     74
     75#include <process.h>
     76#include <stdlib.h>
     77#include <string.h>
    7178
    7279#include <win32type.h>
Note: See TracChangeset for help on using the changeset viewer.