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/gdi32/objhandle.cpp

    r21524 r21916  
    313313//******************************************************************************
    314314#ifdef DEBUG
    315 void dumpObjectType(char *szType, DWORD dwType)
     315void dumpObjectType(const char *szType, DWORD dwType)
    316316{
    317317    for(int i=0;i<MAX_OBJECT_HANDLES;i++) {
    … …  
    445445//******************************************************************************
    446446#ifdef DEBUG
    447 static char *gditypenames[] = {
     447static const char *gditypenames[] = {
    448448"NULL",
    449449"OBJ_PEN",
    … …  
    462462};
    463463
    464 char *DbgGetGDITypeName(DWORD handleType)
     464const char *DbgGetGDITypeName(DWORD handleType)
    465465{
    466466    if(handleType <= OBJ_ENHMETAFILE) {
Note: See TracChangeset for help on using the changeset viewer.