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

    r21304 r21916  
    5656   // Handle for our module
    5757   HMODULE hftModule;
    58    char  *pszModuleName;
     58   const char *pszModuleName;
    5959
    6060   PFN_FT2GETGLYPHINDICES  pfnGetGlyphIndices;
    … …  
    7474   BOOL    bEnabled;
    7575   PFT2FN QueryProcAddress( int );
    76    PFT2FN QueryProcAddress( char* );
     76   PFT2FN QueryProcAddress( const char* );
    7777
    7878 public:
    7979   // Constructor
    80    CFT2Module( char* modulename = FT2LIBNAME );
     80   CFT2Module( const char* modulename = FT2LIBNAME );
    8181   ~CFT2Module();
    8282   void init();
Note: See TracChangeset for help on using the changeset viewer.