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.h

    r21564 r21916  
    1717#endif
    1818
    19 char* ODINHelperStripUNC(char* strUNC);
     19LPCSTR ODINHelperStripUNC(LPCSTR strUNC);
    2020
    2121#ifdef OS2_INCLUDED
    … …  
    4646#define OSLIB_ACCESS_SHAREDENYWRITE     16
    4747
    48 DWORD OSLibDosOpen(char *lpszFileName, DWORD flags);
     48DWORD OSLibDosOpen(LPCSTR lpszFileName, DWORD flags);
    4949BOOL OSLibDosClose(DWORD hFile);
    50 BOOL OSLibDosDelete(char *lpszFileName);
     50BOOL OSLibDosDelete(LPCSTR lpszFileName);
    5151BOOL OSLibDosCopyFile(LPCSTR lpszOldFile, LPCSTR lpszNewFile, BOOL fFailIfExist);
    5252BOOL OSLibDosMoveFile(LPCSTR lpszOldFile, LPCSTR lpszNewFile);
    … …  
    6565#define OSLIB_SEARCHENV         4
    6666
    67 DWORD OSLibDosSearchPath(DWORD cmd, char *path, char *name, char *full_name, DWORD length_fullname);
     67DWORD OSLibDosSearchPath(DWORD cmd, LPCSTR path, LPCSTR name,
     68                         LPSTR full_name, DWORD length_fullname);
    6869
    6970#ifndef FIL_QUERYFULLNAME
    … …  
    366367#endif
    367368
     369#ifdef __cplusplus
     370INLINE LPSTR ODINHelperStripUNC(LPSTR strUNC)
     371{
     372    return (LPSTR)ODINHelperStripUNC((LPCSTR) strUNC);
     373}
     374#endif
     375
    368376#endif //__OSLIBDOS_H__
    369377
Note: See TracChangeset for help on using the changeset viewer.