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

    r21304 r21916  
    7070
    7171    FntLock();
    72     for(int i=0;i<MAX_PUBLICFONTS;i++) {
     72    int i;
     73    for(i=0;i<MAX_PUBLICFONTS;i++) {
    7374        if(strcmp(publicfonts[i].szFaceName, lfFaceName) == 0) {
    7475#ifdef DEBUG
    … …  
    328329    }
    329330    FntLock();
    330     for(int i=0;i<MAX_PUBLICFONTS;i++) {
     331    int i;
     332    for(i=0;i<MAX_PUBLICFONTS;i++) {
    331333        if(strcmp(publicfonts[i].szFontResName, lpszFont) == 0) 
    332334        {
Note: See TracChangeset for help on using the changeset viewer.