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/kernel32/conodin32.cpp

    r8774 r21916  
    237237                    if (pNew)
    238238                    {
    239                         pNew->pfnHandler = pfnHandler;
     239                        pNew->pfnHandler = (void *)pfnHandler;
    240240                        pNew->pPrev = NULL;
    241241
Note: See TracChangeset for help on using the changeset viewer.