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

    r8441 r21916  
    132132          /* Create ILock bytes */
    133133
    134           hr1 = CreateILockBytesOnHGlobal(std.u.hGlobal, FALSE, &ptrILockBytes);
     134          hr1 = CreateILockBytesOnHGlobal(std.DUMMYUNIONNAME_DOT hGlobal, FALSE, &ptrILockBytes);
    135135
    136136          /* Open storage on the ILock bytes */
Note: See TracChangeset for help on using the changeset viewer.