landing xpcom20/21 branch

git-svn-id: svn://10.0.0.236/trunk@32646 18797224-902f-48f8-a5cc-f745e15eee43
1999-05-26 02:16:15 +00:00
parent 27980027bd
commit 4e84129c48
2 changed files with 1 additions and 2 deletions
--- a/mozilla/widget/public/Makefile.in
+++ b/mozilla/widget/public/Makefile.in
@@ -29,7 +29,6 @@ EXPORTS = \
 	nsIFontNameIterator.h \
 	nsIFontRetrieverService.h \
 	nsIFileListTransferable.h \
-	nsIGenericTransferable.h \
 	nsIMenuBar.h	\
 	nsIMenu.h		\
 	nsIMenuItem.h	\
--- a/mozilla/xpcom/base/IIDS.h
+++ b/mozilla/xpcom/base/IIDS.h
@@ -1085,7 +1085,7 @@ nsIDOMHTMLLayerElement = { /* a6cf9100-15b3-11d2-932e-00805f8add32 */
    0x11d2,
    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}
  };
-INTERFACENAME = { /* a6cf9101-15b3-11d2-932e-00805f8add32 */
+nsICSSLoader = { /* a6cf9101-15b3-11d2-932e-00805f8add32 */
    0xa6cf9101,
    0x15b3,
    0x11d2,