diff options
| author | Paolo Molaro <lupus@oddwiz.org> | 2006-02-28 19:50:17 +0300 |
|---|---|---|
| committer | Paolo Molaro <lupus@oddwiz.org> | 2006-02-28 19:50:17 +0300 |
| commit | f5b438a51d17bea29009c61303a525bf83ffb97a (patch) | |
| tree | eb66aa786d379fc3201dc2b7662e189edd1c8f32 | |
| parent | 993711711521930e3fd6c65ced4581a7afa2ddcb (diff) | |
Backport pinvoke lookup change.
svn path=/branches/mono-1-1-13/mono/; revision=57404
| -rw-r--r-- | mono/metadata/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/metadata/loader.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 01f666f4f40..e8dfc0b6cd5 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,4 +1,9 @@ +Tue Feb 28 17:43:20 CET 2006 Paolo Molaro <lupus@ximian.com> + + * loader.c: on unix, lookup the "*A" version of a function + if charset is auto as a second option before failing. + Thu Feb 16 15:42:13 CET 2006 Paolo Molaro <lupus@ximian.com> * marshal.c: handle additional GENERICINST case (patch from diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index 2cb7a7f2fad..0c18210a34b 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -1020,6 +1020,10 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char #ifdef PLATFORM_WIN32 if (mangle_charset == 0) mangled_name = g_strconcat (import, "W", NULL); +#else + /* Try the mangled name last */ + if (mangle_charset == 1) + mangled_name = g_strconcat (import, "A", NULL); #endif break; case PINVOKE_ATTRIBUTE_CHAR_SET_ANSI: |