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

    r9400 r21916  
    3636#include "wtypes.h"
    3737
    38 extern HRESULT WINE_StringFromCLSID(const CLSID *id,LPSTR idstr);
     38extern HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid);
    3939extern HRESULT create_marshalled_proxy(REFCLSID rclsid, REFIID iid, LPVOID *ppv);
    4040
Note: See TracChangeset for help on using the changeset viewer.