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

    r21640 r21916  
    536536 *  pidl2 equal pidl1           pointer to last 0x00-element of pidl2
    537537 */
    538 LPITEMIDLIST ILFindChild(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
     538LPITEMIDLIST WIN32API ILFindChild(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
    539539{
    540540        char    szData1[MAX_PATH];
    … …  
    769769 *     exported by ordinal
    770770 */
    771 DWORD ILFree(LPITEMIDLIST pidl)
     771DWORD WIN32API ILFree(LPITEMIDLIST pidl)
    772772{
    773773  if(!pidl)
Note: See TracChangeset for help on using the changeset viewer.