diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-11-16 00:18:47 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-11-16 00:18:47 +0300 |
| commit | d894f552950db758bde33f408125369e90ad61d5 (patch) | |
| tree | 37af3b1931e68e8693cddec5c6f6537b1051d384 | |
| parent | ed2b976b0ff0592a2ac9b9358d4f58a43660aec3 (diff) | |
* lib/uuid.c (IID_IRunnableObject): Remove duplicate definition.
(IID_IStdMarshalInfo): Ditto.
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/lib/uuid.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6f1947f2c..44b305629 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 2002-11-15 Christopher Faylor <cgf@redhat.com> + * lib/uuid.c (IID_IRunnableObject): Remove duplicate definition. + (IID_IStdMarshalInfo): Ditto. + +2002-11-15 Christopher Faylor <cgf@redhat.com> + * lib/uuid.c (IID_IOleInPlaceSite): Remove duplicate definition. (IID_IPersistStorage): Ditto. diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c index e19c26fa3..065f644c6 100644 --- a/winsup/w32api/lib/uuid.c +++ b/winsup/w32api/lib/uuid.c @@ -267,7 +267,6 @@ DEFINE_GUID(IID_IRpcProxyBuffer34,0x3bd5f56a,0x1a59,0xb510,0x69,0x8,0,0x2b,0x2d, DEFINE_GUID(IID_IRpcStub,0x5,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(IID_IRpcStubBuffer,0xd5f56afc,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a); DEFINE_OLEGUID(IID_IRunnableObject,0x00000126,0,0); -DEFINE_GUID(IID_IRunnableObject,0x126,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(IID_IRunningObjectTable,0x10,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(IID_ISequentialStream,0xc733a30,0x2a1c,0x11ce,0xad,0xe5,0,0xaa,0,0x44,0x77,0x3d); DEFINE_GUID(IID_IServerHandler,0xf4f569d0,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a); @@ -276,7 +275,6 @@ DEFINE_GUID(IID_IServiceProvider,0x6d5140c1,0x7436,0x11ce,0x80,0x34,0,0xaa,0,0x6 DEFINE_GUID(IID_ISimpleFrameSite,0x742b0e01,0x14e6,0x101b,0x91,0x4e,0,0xaa,0,0x30,0xc,0xab); DEFINE_GUID(IID_ISpecifyPropertyPages,0xb196b28b,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7); DEFINE_OLEGUID(IID_IStdMarshalInfo,24,0,0); -DEFINE_GUID(IID_IStdMarshalInfo,0x18,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(IID_IStorage,0xb,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(IID_IStream,0xc,0,0,0xc0,0,0,0,0,0,0,0x46); DEFINE_GUID(IID_IStub,0x26,0,0,0xc0,0,0,0,0,0,0,0x46); |