diff options
| author | Paolo Molaro <lupus@oddwiz.org> | 2005-07-07 20:37:45 +0400 |
|---|---|---|
| committer | Paolo Molaro <lupus@oddwiz.org> | 2005-07-07 20:37:45 +0400 |
| commit | c98a5a06a01a417e564885a09b78be225c92fb63 (patch) | |
| tree | 93968aa19660517e8e392e0d8e7ea897d0244ca3 /support | |
| parent | 819e9992ce38c8afd31e7af794510ff400f6f201 (diff) | |
Thu Jul 7 12:35:20 EDT 2005 Paolo Molaro <lupus@ximian.com>
*supportw.c, Makefile.am: remove calls and link to libmono/libwapi.
svn path=/trunk/mono/; revision=47049
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 5 | ||||
| -rw-r--r-- | support/Makefile.am | 3 | ||||
| -rw-r--r-- | support/supportw.c | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 6d6ffe958ae..cbe7c48fd02 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,8 @@ + +Thu Jul 7 12:35:20 EDT 2005 Paolo Molaro <lupus@ximian.com> + + *supportw.c, Makefile.am: remove calls and link to libmono/libwapi. + 2005-07-01 Daniel Drake <dsd@gentoo.org> * sys-xattr.c: Support FreeBSD's extattr implementation. Slight API rework diff --git a/support/Makefile.am b/support/Makefile.am index 388ed90a2e0..20a43eab426 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -80,8 +80,7 @@ libMonoSupportW_la_SOURCES = \ supportw.h libMonoSupportW_la_LIBADD = \ - $(top_builddir)/mono/io-layer/libwapi.la \ - $(top_builddir)/mono/mini/libmono.la + $(GLIB_LIBS) # # Use this target to refresh the values in map.[ch] diff --git a/support/supportw.c b/support/supportw.c index 434301d6359..158fce068be 100644 --- a/support/supportw.c +++ b/support/supportw.c @@ -86,6 +86,8 @@ supportw_register_delegate (const char *function_name, void *fnptr) static gboolean register_assembly (const char *name, int *registered) { +/* we can't use mono or wapi funcions in a support lib */ +#if 0 MonoAssembly *assembly; MonoImageOpenStatus status; MonoImage *image; @@ -127,6 +129,9 @@ register_assembly (const char *name, int *registered) *registered = 1; mono_assembly_close (assembly); return TRUE; +#else + return FALSE; +#endif } void |