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/rpc.c

    r9451 r21916  
    547547  hres = IStream_Write(pStm,marshalbuffer,bufferlen,&res);
    548548  if (hres) goto out;
    549   seekto.s.LowPart = 0;seekto.s.HighPart = 0;
     549  seekto.DUMMYSTRUCTNAME_DOT LowPart = 0;seekto.DUMMYSTRUCTNAME_DOT HighPart = 0;
    550550  hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos);
    551551  hres = CoUnmarshalInterface(pStm,&IID_IClassFactory,ppv);
Note: See TracChangeset for help on using the changeset viewer.