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/shlwapi/ordinal_odin.cpp

    r21494 r21916  
    2929#include <ctype.h>
    3030#include <wctype.h>
     31#ifndef __GNUC__
    3132#include <wcstr.h>
     33#endif
    3234#define HAVE_WCTYPE_H
    3335
    … …  
    3840#include <heapstring.h>
    3941#include <misc.h>
    40 #include <win\shell.h>
    41 #include <win\winerror.h>
     42#include <win/shell.h>
     43#include <win/winerror.h>
    4244#include <winversion.h>
    4345#include <winuser.h>
Note: See TracChangeset for help on using the changeset viewer.