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

    r21675 r21916  
    8888static  CDDRVLTR    cdDrvLtr = {0xffff, 0xffff};
    8989
     90extern "C" {
    9091
    9192/*******************************************************************************
    … …  
    9899static ULONG crc32str(const char *psz);
    99100
    100 char* ODINHelperStripUNC(char* strUNC)
    101 {
    102     char *retStr = strUNC;
     101LPCSTR ODINHelperStripUNC(LPCSTR strUNC)
     102{
     103    LPCSTR retStr = strUNC;
    103104
    104105    if (!strUNC) return NULL;
    … …  
    460461//******************************************************************************
    461462//******************************************************************************
    462 DWORD OSLibDosOpen(char *lpszFileName, DWORD flags)
     463DWORD OSLibDosOpen(LPCSTR lpszFileName, DWORD flags)
    463464{
    464465 APIRET rc;
    … …  
    721722//******************************************************************************
    722723//******************************************************************************
    723 BOOL OSLibDosDelete(char *lpszFileName)
     724BOOL OSLibDosDelete(LPCSTR lpszFileName)
    724725{
    725726    APIRET rc;
    … …  
    850851DWORD WIN32API GetEnvironmentVariableA(LPCSTR, LPSTR, DWORD );
    851852//******************************************************************************
    852 DWORD OSLibDosSearchPath(DWORD cmd, char *path, char *name, char *full_name,
    853                          DWORD length_fullname)
     853DWORD OSLibDosSearchPath(DWORD cmd, LPCSTR path, LPCSTR name,
     854                         LPSTR full_name, DWORD length_fullname)
    854855{
    855856  switch(cmd) {
    … …  
    947948   APIRET  rc = ERROR_NOT_ENOUGH_MEMORY;
    948949
    949    CHAR* lpszFileLoc = ODINHelperStripUNC(lpszFile);
     950   LPCSTR lpszFileLoc = ODINHelperStripUNC(lpszFile);
    950951
    951952   //TODO: lpSecurityAttributes (inheritance)
    … …  
    35893590}
    35903591
     3592} // extern "C"
     3593
Note: See TracChangeset for help on using the changeset viewer.