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

    r21628 r21916  
    4848// Constructor
    4949//******************************************************************************
    50 CFT2Module::CFT2Module(char* sModuleName): bEnabled(FALSE), hftModule(0), pfnGetGlyphIndices(NULL),
     50CFT2Module::CFT2Module(const char* sModuleName): bEnabled(FALSE), hftModule(0), pfnGetGlyphIndices(NULL),
    5151                pfnFt2GetTextExtentW(NULL), pfnFt2EnableFontEngine(NULL),
    5252                pfnFt2GetGlyphOutline(NULL), pfnFt2CharStringPosAtA(NULL),
    … …  
    183183//******************************************************************************
    184184//******************************************************************************
    185 PFN CFT2Module::QueryProcAddress(char * procname)
     185PFN CFT2Module::QueryProcAddress(const char * procname)
    186186{
    187187    APIRET rc;
Note: See TracChangeset for help on using the changeset viewer.