[Mono-list] patch for assembly.c

Guenther Roith groith@tcrz.net
Thu, 23 May 2002 08:41:26 +0200


This is a multi-part message in MIME format.

------=_NextPart_000_0016_01C20235.A02CAD80
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Here is a little patch for assembly.c to fix the problem with the path being
fixed on windows for corlib.dll. It works on windows, but I haven't tried it
on linux. I someone could do and eventually add it to cvs.

Johannes

------=_NextPart_000_0016_01C20235.A02CAD80
Content-Type: application/octet-stream;
	name="file.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="file.diff"

? file.diff=0A=
Index: assembly.c=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
RCS file: /cvs/public/mono/mono/metadata/assembly.c,v=0A=
retrieving revision 1.37=0A=
diff -u -r1.37 assembly.c=0A=
--- assembly.c	18 May 2002 17:32:35 -0000	1.37=0A=
+++ assembly.c	23 May 2002 02:40:17 -0000=0A=
@@ -282,9 +282,8 @@=0A=
 			if (corlib)=0A=
 				return corlib;=0A=
 		}=0A=
-		fullpath =3D g_concat_dir_and_file (MONO_ASSEMBLIES, CORLIB_NAME);=0A=
-		corlib =3D mono_assembly_open (fullpath, status);=0A=
-		g_free (fullpath);=0A=
+		corlib =3D load_in_path (CORLIB_NAME, default_path, status);=0A=
+		g_free (CORLIB_NAME);=0A=
 		return corlib;=0A=
 	}=0A=
 	result =3D search_loaded (aname);=0A=

------=_NextPart_000_0016_01C20235.A02CAD80--