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/user32/dc.h

    r10379 r21916  
    2121BOOL GetOS2UpdateRect(Win32BaseWindow *window,LPRECT pRect);
    2222
    23 int WIN32API GetUpdateRgnFrame(HWND hwnd, HRGN hrgn);
     23extern "C" int WIN32API GetUpdateRgnFrame(HWND hwnd, HRGN hrgn);
    2424
    2525#ifdef DEBUG
Note: See TracChangeset for help on using the changeset viewer.