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

    r10587 r21916  
    1616#ifdef __cplusplus
    1717
    18 #include <win32class.h>
    19 #include <gen_object.h>
    20 #include <win32wndchild.h>
    2118#include <winuser32.h>
    2219#include <winres.h>
    2320#include <scroll.h>
     21
     22#include "win32class.h"
     23#include "gen_object.h"
     24#include "win32wndchild.h"
    2425
    2526class Win32BaseWindow;
    … …  
    352353#ifdef DEBUG
    353354         LONG addRef();
    354          LONG release(char *function = __FUNCTION__, int line = __LINE__ );
     355         LONG release(const char *function = __FUNCTION__, int line = __LINE__ );
    355356#endif
    356357
Note: See TracChangeset for help on using the changeset viewer.