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/shell32/misc.cpp

    r21494 r21916  
    2020
    2121#include <wchar.h>
     22#ifndef __GNUC__
    2223#include <wcstr.h>
     24#endif
    2325
    2426#define CINTERFACE
    … …  
    5456BOOL SHELL_OsIsUnicode(void)
    5557{
    56  static version = 0;
     58 static int version = 0;
    5759
    5860  if(version == 0) {
Note: See TracChangeset for help on using the changeset viewer.