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/ole32/compositemoniker.c

    r8620 r21916  
    436436        return E_POINTER;
    437437
    438     pcbSize->s.LowPart =0;
    439     pcbSize->s.HighPart=0;
     438    pcbSize->DUMMYSTRUCTNAME_DOT LowPart =0;
     439    pcbSize->DUMMYSTRUCTNAME_DOT HighPart=0;
    440440
    441441    IMoniker_Enum(iface,TRUE,&enumMk);
    … …  
    447447        IMoniker_Release(pmk);
    448448
    449         pcbSize->s.LowPart +=ptmpSize.s.LowPart;
    450         pcbSize->s.HighPart+=ptmpSize.s.HighPart;
     449        pcbSize->DUMMYSTRUCTNAME_DOT LowPart +=ptmpSize.DUMMYSTRUCTNAME_DOT LowPart;
     450        pcbSize->DUMMYSTRUCTNAME_DOT HighPart+=ptmpSize.DUMMYSTRUCTNAME_DOT HighPart;
    451451    }
    452452
Note: See TracChangeset for help on using the changeset viewer.