Commit 52337535 by Andrew Haley Committed by Andrew Haley

natClassLoader.cc: Don't include link.h or dladdr.h.

2006-04-25  Andrew Haley  <aph@redhat.com>

        * java/lang/natClassLoader.cc: Don't include link.h or dladdr.h.
        * boehm.cc: Don't include link.h.
        (_Jv_RegisterLibForGc): Cast away const when calling dladdr().

From-SVN: r113246
parent 75d8b2d0
2006-04-25 Andrew Haley <aph@redhat.com>
* java/lang/natClassLoader.cc: Don't include link.h or dladdr.h.
* boehm.cc: Don't include link.h.
(_Jv_RegisterLibForGc): Cast away const when calling dladdr().
2006-04-24 Tom Tromey <tromey@redhat.com> 2006-04-24 Tom Tromey <tromey@redhat.com>
* java/lang/natClass.cc (_Jv_getInterfaceMethod): Skip <clinit>. * java/lang/natClass.cc (_Jv_getInterfaceMethod): Skip <clinit>.
......
...@@ -36,7 +36,6 @@ details. */ ...@@ -36,7 +36,6 @@ details. */
#undef _GNU_SOURCE #undef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#include <dlfcn.h> #include <dlfcn.h>
#include <link.h>
#endif #endif
extern "C" extern "C"
...@@ -664,8 +663,8 @@ _Jv_RegisterLibForGc (const void *p __attribute__ ((__unused__))) ...@@ -664,8 +663,8 @@ _Jv_RegisterLibForGc (const void *p __attribute__ ((__unused__)))
{ {
#ifdef HAVE_DLFCN_H #ifdef HAVE_DLFCN_H
Dl_info info; Dl_info info;
if (dladdr (p, &info) != 0) if (dladdr (const_cast<void *>(p), &info) != 0)
{ {
filename_node **node = find_file (info.dli_fname); filename_node **node = find_file (info.dli_fname);
if (! *node) if (! *node)
......
...@@ -45,11 +45,6 @@ details. */ ...@@ -45,11 +45,6 @@ details. */
#include <gnu/gcj/runtime/BootClassLoader.h> #include <gnu/gcj/runtime/BootClassLoader.h>
#include <gnu/gcj/runtime/SystemClassLoader.h> #include <gnu/gcj/runtime/SystemClassLoader.h>
#undef _GNU_SOURCE
#define _GNU_SOURCE
#include <dlfcn.h>
#include <link.h>
// Size of local hash table. // Size of local hash table.
#define HASH_LEN 1013 #define HASH_LEN 1013
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment