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

    r21566 r21916  
    11841184  DWORD sp = 0, lp = 0,attr;
    11851185  LPSTR tmpshortpath,tmplongpath;
    1186   LPSTR lpszShortPath1, lpszLongPath1;
     1186  LPCSTR lpszShortPath1;
     1187  LPSTR lpszLongPath1;
    11871188
    11881189   dprintf(("GetLongPathNameA %s %x %d", lpszShortPath, lpszLongPath, cchBuffer));
    … …  
    12031204   }
    12041205
    1205    lpszShortPath1 = ODINHelperStripUNC((char*)lpszShortPath);
    1206    lpszLongPath1 = ODINHelperStripUNC((char*)lpszLongPath);
     1206   lpszShortPath1 = ODINHelperStripUNC(lpszShortPath);
     1207   lpszLongPath1 = ODINHelperStripUNC(lpszLongPath);
    12071208
    12081209   lstrcpyA(tmpshortpath,lpszShortPath1);
Note: See TracChangeset for help on using the changeset viewer.