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

    r8614 r21916  
    511511 * PathFindOnPathAW     [SHELL32]
    512512 */
    513 BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs)
    514 {
    515         if (SHELL_OsIsUnicode())
    516           return PathFindOnPathW(sFile, sOtherDirs);
    517         return PathFindOnPathA(sFile, sOtherDirs);
     513BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs)
     514{
     515        if (SHELL_OsIsUnicode())
     516          return PathFindOnPathW(sFile, (LPCWSTR *)sOtherDirs);
     517        return PathFindOnPathA(sFile, (LPCSTR *)sOtherDirs);
    518518}
    519519
Note: See TracChangeset for help on using the changeset viewer.