Merge pull request #1857 from slluis/fix-assembly-resolver

[mono.git] / mcs / class / corlib / System.Runtime.InteropServices / UCOMITypeLib.cs

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
index 6a637f0acc1dcf14fa82a9b825ef79ad5ba0f073..2b9c1ccdc0da9ae69006d80cf71dc6e0b45217ec 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
@@ -1,6 +1,6 @@
 
 //
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,21 +28,15 @@
 //
 // (C) 2002 Ximian, Inc.
 
-using System;
-using System.Runtime.InteropServices;
-
+#if !FULL_AOT_RUNTIME
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
        [Obsolete]
-#endif
        [ComImport]
        [Guid("00020402-0000-0000-c000-000000000046")]
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMITypeLib { 
-#if NET_2_0
                [PreserveSig]
-#endif
                int GetTypeInfoCount ();
                void GetTypeInfo (int index, out UCOMITypeInfo ppTI);
                void GetTypeInfoType (int index, out TYPEKIND pTKind);
@@ -52,11 +46,10 @@ namespace System.Runtime.InteropServices
                void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
                [return: MarshalAs (UnmanagedType.Bool)]
                bool IsName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal);
-               void FindName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80)] UCOMITypeInfo[] ppTInfo, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80)] int[] rgMemId, ref short pcFound);
-#if NET_2_0
+               void FindName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal, [Out, MarshalAs (UnmanagedType.LPArray)] UCOMITypeInfo[] ppTInfo, [Out, MarshalAs (UnmanagedType.LPArray)] int[] rgMemId, ref short pcFound);
                [PreserveSig]
-#endif
                void ReleaseTLibAttr (IntPtr pTLibAttr);
        }
 }
 
+#endif