Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/console.cpp

    r21426 r21916  
    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>
    … …  
    23082315}
    23092316
     2317extern "C" {
    23102318
    23112319/*****************************************************************************
    … …  
    37723780  return fResult;
    37733781}
     3782
     3783} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.