Mercurial > hg > release > icedtea7-forest-2.4 > jdk
changeset 7270:87efaa6ab6c5
6571600: JNI use results in UnsatisfiedLinkError looking for libmawt.so
Summary: Fix is to call dladdr with name less likely to cause name conflict.
Reviewed-by: serb, art
| author | dbuck |
|---|---|
| date | Mon, 06 Jan 2014 17:02:35 -0800 |
| parents | 95e59bea1725 |
| children | ff1c173f8810 |
| files | src/solaris/native/sun/awt/awt_LoadLibrary.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/sun/awt/awt_LoadLibrary.c Mon Jan 06 13:57:11 2014 -0800 +++ b/src/solaris/native/sun/awt/awt_LoadLibrary.c Mon Jan 06 17:02:35 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -96,7 +96,7 @@ jvm = vm; /* Get address of this library and the directory containing it. */ - dladdr((void *)JNI_OnLoad, &dlinfo); + dladdr((void *)AWT_OnLoad, &dlinfo); realpath((char *)dlinfo.dli_fname, buf); len = strlen(buf); p = strrchr(buf, '/');