diff options
Diffstat (limited to 'lang/mono/files')
3 files changed, 32 insertions, 52 deletions
diff --git a/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs b/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs deleted file mode 100644 index 0406d04f70f9..000000000000 --- a/lang/mono/files/patch-mcs_class_System.Web_System.Web.Compilation_AspParser.cs +++ /dev/null @@ -1,17 +0,0 @@ ---- mcs/class/System.Web/System.Web.Compilation/AspParser.cs.orig Fri Dec 29 22:13:43 2006 -+++ mcs/class/System.Web/System.Web.Compilation/AspParser.cs Fri Dec 29 22:14:41 2006 -@@ -454,8 +454,12 @@ - tokenizer.Verbatim = false; - id = inside_tags; - attributes = null; -- tagtype = (databinding ? TagType.DataBinding : -- (varname ? TagType.CodeRenderExpression : TagType.CodeRender)); -+ if (databinding) -+ tagtype = TagType.DataBinding; -+ else if (varname) -+ tagtype = TagType.CodeRenderExpression; -+ else -+ tagtype = TagType.CodeRender; - } - - public event ParseErrorHandler Error; diff --git a/lang/mono/files/patch-mono_io-layer_processes.c b/lang/mono/files/patch-mono_io-layer_processes.c new file mode 100644 index 000000000000..c4be002359d9 --- /dev/null +++ b/lang/mono/files/patch-mono_io-layer_processes.c @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- mono/io-layer/processes.c.orig ++++ mono/io-layer/processes.c +@@ -1950,7 +1950,7 @@ + { + mods = load_modules (); + #else +- filename = g_strdup_printf ("/proc/%d/maps", pid); ++ filename = g_strdup_printf ("/proc/%d/map", pid); + if ((fp = fopen (filename, "r")) == NULL) { + /* No /proc/<pid>/maps so just return the main module + * shortcut for now +@@ -2111,7 +2111,7 @@ + { + mods = load_modules (); + #else +- filename = g_strdup_printf ("/proc/%d/maps", pid); ++ filename = g_strdup_printf ("/proc/%d/map", pid); + if ((fp = fopen (filename, "r")) == NULL) { + if (errno == EACCES && module == NULL && base == TRUE) { + procname_ext = get_process_name_from_proc (pid); +@@ -2266,7 +2266,7 @@ + mods = load_modules (); + #else + /* Look up the address in /proc/<pid>/maps */ +- filename = g_strdup_printf ("/proc/%d/maps", pid); ++ filename = g_strdup_printf ("/proc/%d/map", pid); + if ((fp = fopen (filename, "r")) == NULL) { + /* No /proc/<pid>/maps, so just return failure + * for now diff --git a/lang/mono/files/patch-mono_metadata_filewatcher.c b/lang/mono/files/patch-mono_metadata_filewatcher.c deleted file mode 100644 index a4c4218c61be..000000000000 --- a/lang/mono/files/patch-mono_metadata_filewatcher.c +++ /dev/null @@ -1,35 +0,0 @@ ---- mono/metadata/filewatcher.c.orig Fri Dec 29 19:52:48 2006 -+++ mono/metadata/filewatcher.c Fri Dec 29 20:25:18 2006 -@@ -44,9 +44,6 @@ - gint - ves_icall_System_IO_FSW_SupportsFSW (void) - { --#if HAVE_KQUEUE -- return 3; --#else - MonoDl *fam_module; - gchar *filename; - int lib_used = 4; /* gamin */ -@@ -76,14 +73,20 @@ - } - - if (fam_module == NULL) -- return 0; -+ goto nofam; - - err = mono_dl_symbol (fam_module, "FAMNextEvent", (gpointer *) &FAMNextEvent); - g_free (err); - if (FAMNextEvent == NULL) -- return 0; -+ goto nofam; - - return lib_used; -+ -+ nofam: -+#if HAVE_KQUEUE -+ return 3; -+#else -+ return 0; - #endif - } - |