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/ole2nls.c

    r21355 r21916  
    1616#include <heapstring.h>
    1717#include <ctype.h>
     18#ifndef __GNUC__
    1819#include <wcstr.h>
     20#endif
    1921#endif
    2022
    … …  
    19261928#ifdef __WIN32OS2__
    19271929    /* For WCHAR we better use the WCHAR toupper/lower.
    1928      * (VAC308 toupper/tolower doesn't do range checks according to standards 
     1930     * (VAC308 toupper/tolower doesn't do range checks according to standards
    19291931     *  which may cause illegal memory reads access when misused like it were here.
    19301932     */
Note: See TracChangeset for help on using the changeset viewer.