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

    r21544 r21916  
    969969PVOID OSLibWinSubclassWindow(HWND hwnd,PVOID newWndProc)
    970970{
    971   return WinSubclassWindow(hwnd,(PFNWP)newWndProc);
     971  return (PVOID)WinSubclassWindow(hwnd,(PFNWP)newWndProc);
    972972}
    973973//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.