diff options
| author | Paolo Molaro <lupus@oddwiz.org> | 2006-02-28 19:44:55 +0300 |
|---|---|---|
| committer | Paolo Molaro <lupus@oddwiz.org> | 2006-02-28 19:44:55 +0300 |
| commit | 9b39547d7a8dccc4462e98a95e008e43180faacf (patch) | |
| tree | 2e66666cc3acf96e1bbc26a057900336666c16ce | |
| parent | c01749afbcef97791029a28f7e8245055af58c44 (diff) | |
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.
svn path=/trunk/mono/; revision=57403
| -rw-r--r-- | mono/metadata/ChangeLog | 6 | ||||
| -rw-r--r-- | mono/metadata/loader.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index e8b6e684e16..f1052f175cb 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +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. + 2006-02-28 Raja R Harinath <rharinath@novell.com> * class.h (mono_class_inflate_generic_method): Revert to two diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index fb923e442f6..6d2a4165fcc 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -1064,6 +1064,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: |