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/heapstring.cpp

    r21361 r21916  
    2525#include <unicode.h>
    2626#include <ctype.h>
     27#include <wchar.h>
     28#ifndef __GNUC__
    2729#include <wcstr.h>
     30#endif
    2831#include "heap.h"
    29 #include <wine\unicode.h>
     32#include <wine/unicode.h>
    3033#include "misc.h"
    3134#include "codepage.h"
    … …  
    443446      return 1;
    444447
    445   return strcmpi(arg1, arg2);
     448  return stricmp(arg1, arg2);
    446449}
    447450
Note: See TracChangeset for help on using the changeset viewer.