aboutsummaryrefslogtreecommitdiff
path: root/winsup
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2002-11-15 21:11:29 +0000
committerChristopher Faylor <me@cgf.cx>2002-11-15 21:11:29 +0000
commited2b976b0ff0592a2ac9b9358d4f58a43660aec3 (patch)
treed6549b4ba8e7b41959d02d7fc71928e4684eaaed /winsup
parentf319cb1ad3062aaaa78a4da95e9ee90278d8ec33 (diff)
downloadnewlib-ed2b976b0ff0592a2ac9b9358d4f58a43660aec3.zip
newlib-ed2b976b0ff0592a2ac9b9358d4f58a43660aec3.tar.gz
newlib-ed2b976b0ff0592a2ac9b9358d4f58a43660aec3.tar.bz2
* lib/uuid.c (IID_IOleInPlaceSite): Remove duplicate definition.
(IID_IPersistStorage): Ditto.
Diffstat (limited to 'winsup')
-rw-r--r--winsup/w32api/ChangeLog5
-rw-r--r--winsup/w32api/lib/uuid.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6a704df..6f1947f 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-15 Christopher Faylor <cgf@redhat.com>
+
+ * lib/uuid.c (IID_IOleInPlaceSite): Remove duplicate definition.
+ (IID_IPersistStorage): Ditto.
+
2002-11-15 Weiqi Gao <weiqigao@users.sourceforge.net>
* lib/uuid.c (CLSID_PSClassObject, CLSID_PSEnumerators,
diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
index 063d118..e19c26f 100644
--- a/winsup/w32api/lib/uuid.c
+++ b/winsup/w32api/lib/uuid.c
@@ -212,7 +212,6 @@ DEFINE_GUID(IID_IOleInPlaceFrame,0x116,0,0,0xc0,0,0,0,0,0,0,0x46);
DEFINE_GUID(IID_IOleInPlaceObject,0x113,0,0,0xc0,0,0,0,0,0,0,0x46);
DEFINE_GUID(IID_IOleInPlaceObjectWindowless,0x1c2056cc,0x5ef4,0x101b,0x8b,0xc8,0,0xaa,0,0x3e,0x3b,0x29);
DEFINE_OLEGUID(IID_IOleInPlaceSite,0x00000119,0,0);
-DEFINE_GUID(IID_IOleInPlaceSite,0x119,0,0,0xc0,0,0,0,0,0,0,0x46);
DEFINE_GUID(IID_IOleInPlaceSiteEx,0x9c2cad80,0x3424,0x11cf,0xb6,0x70,0,0xaa,0,0x4c,0xd6,0xd8);
DEFINE_GUID(IID_IOleInPlaceSiteWindowless,0x922eada0,0x3424,0x11cf,0xb6,0x70,0,0xaa,0,0x4c,0xd6,0xd8);
DEFINE_GUID(IID_IOleInPlaceUIWindow,0x115,0,0,0xc0,0,0,0,0,0,0,0x46);
@@ -237,7 +236,6 @@ DEFINE_GUID(IID_IPersistMemory,0xbd1ae5e0,0xa6ae,0x11ce,0xbd,0x37,0x50,0x42,0,0x
DEFINE_GUID(IID_IPersistMonikerC9,0xf979eac9,0xceba,0x8c11,0x82,0,0xaa,0,0x4b,0xa9,0xb,0);
DEFINE_GUID(IID_IPersistPropertyBag,0x37d84f60,0x42cb,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51);
DEFINE_OLEGUID(IID_IPersistStorage,0x0000010a,0,0);
-DEFINE_GUID(IID_IPersistStorage,0x10A,0,0,0xc0,0,0,0,0,0,0,0x46;
DEFINE_GUID(IID_IPersistStream,0x109,0,0,0xc0,0,0,0,0,0,0,0x46);
DEFINE_GUID(IID_IPersistStreamInit,0x7fd52380,0x4e07,0x101b,0xae,0x2d,0x8,0,0x2b,0x2e,0xc7,0x13);
DEFINE_GUID(IID_IPicture,0x7bf80980,0xbf32,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);