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 deleted
4 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/controls/controls.h

    r8543 r21916  
    1010#define __CONTROLS_H
    1111
    12 #include <win\win.h>
     12#include <win/win.h>
    1313#include <heapstring.h>
    1414

  • trunk/src/user32/controls/initodinctrl.cpp

    r21649 r21916  
    6767         ParseLogStatusOdinCtrl();
    6868
    69          if (InitializeKernel32() == 0)
     69         if (!InitializeKernel32())
    7070             return 0;
    7171

  • trunk/src/user32/controls/initterm.cpp

    r8543 r21916  
    5151/* calling this function.                                                   */
    5252/****************************************************************************/
    53 ULONG DLLENTRYPOINT_CCONV DLLENTRYPOINT_NAME(ULONG hModule, ULONG ulFlag)
     53ULONG SYSTEM _DLL_InitTerm(ULONG hModule, ULONG ulFlag)
    5454{
    5555   size_t i;
Note: See TracChangeset for help on using the changeset viewer.