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/gdi32/oslibgpi.cpp

    r21304 r21916  
    428428}
    429429
    430 ULONG OSLibGpiQueryCp(HDC hdc)
     430ULONG SYSTEM OSLibGpiQueryCp(HDC hdc)
    431431{
    432432  return GpiQueryCp(hdc);
    433433}
    434434
    435 BOOL OSLibGpiSetCp(HDC hdc, ULONG codepage)
     435BOOL SYSTEM OSLibGpiSetCp(HDC hdc, ULONG codepage)
    436436{
    437437  return GpiSetCp(hdc, codepage);
Note: See TracChangeset for help on using the changeset viewer.