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/include/win/winnls.h

    r21360 r21916  
    560560 */
    561561
     562#ifdef __cplusplus
     563extern "C" {
     564#endif
     565
    562566UINT        WINAPI CompareStringA(LCID,DWORD,LPCSTR,DWORD,LPCSTR,DWORD);
    563567UINT        WINAPI CompareStringW(LCID,DWORD,LPCWSTR,DWORD,LPCWSTR,DWORD);
    … …  
    633637INT         WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL);
    634638
     639#ifdef __cplusplus
     640} // extern "C"
     641#endif
     642
    635643#endif //#ifndef OS2_INCLUDED
    636644
Note: See TracChangeset for help on using the changeset viewer.