diff options
| author | Andreas Tobler <a.tobler@schweiz.ch> | 2006-07-04 22:21:40 +0200 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2006-07-04 22:21:40 +0200 |
| commit | d25f0ebc386ed1a8579c54e3b7d815633daaee1d (patch) | |
| tree | df79bd6e530999bef7480c314c71636a275971fc /libjava | |
| parent | 706601d965756f53d473d8b173c788cefc9b2917 (diff) | |
| download | gcc-d25f0ebc386ed1a8579c54e3b7d815633daaee1d.zip gcc-d25f0ebc386ed1a8579c54e3b7d815633daaee1d.tar.gz gcc-d25f0ebc386ed1a8579c54e3b7d815633daaee1d.tar.bz2 | |
re PR libgcj/28226 (posix.cc:222: error: invalid conversion from 'const void*' to 'void*')
2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>
PR libgcj/28226:
* include/posix.h (_Jv_platform_dladdr): Remove const qualifier.
* include/win32.h (_Jv_platform_dladdr): Likewise.
* posix.cc (_Jv_platform_dladdr): Likewise.
* win32.cc (_Jv_platform_dladdr): Likewise.
From-SVN: r115184
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/include/posix.h | 2 | ||||
| -rw-r--r-- | libjava/include/win32.h | 2 | ||||
| -rw-r--r-- | libjava/posix.cc | 2 | ||||
| -rw-r--r-- | libjava/win32.cc | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3e22f23..fd3b6d0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2006-07-04 Andreas Tobler <a.tobler@schweiz.ch> + PR libgcj/28226: + * include/posix.h (_Jv_platform_dladdr): Remove const qualifier. + * include/win32.h (_Jv_platform_dladdr): Likewise. + * posix.cc (_Jv_platform_dladdr): Likewise. + * win32.cc (_Jv_platform_dladdr): Likewise. + * testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar instead of libgcj-*.jar. diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 15795dd..ea4762c 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -199,6 +199,6 @@ struct _Jv_AddrInfo; // Given an address, determine the executable or shared object that defines // it and the nearest named symbol. -extern int _Jv_platform_dladdr (const void *addr, _Jv_AddrInfo *info); +extern int _Jv_platform_dladdr (void *addr, _Jv_AddrInfo *info); #endif /* __JV_POSIX_H__ */ diff --git a/libjava/include/win32.h b/libjava/include/win32.h index 26c307c..a461d88 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -180,6 +180,6 @@ struct _Jv_AddrInfo; // Given an address, determine the executable or shared object that defines // it and the nearest named symbol. -extern int _Jv_platform_dladdr (const void *addr, _Jv_AddrInfo *info); +extern int _Jv_platform_dladdr (void *addr, _Jv_AddrInfo *info); #endif /* __JV_WIN32_H__ */ diff --git a/libjava/posix.cc b/libjava/posix.cc index 41702df..d191d8e 100644 --- a/libjava/posix.cc +++ b/libjava/posix.cc @@ -213,7 +213,7 @@ _Jv_select (int n, fd_set *readfds, fd_set *writefds, // defined symbol to that address. Returns 0 if no object defines this // address. int -_Jv_platform_dladdr (const void *addr, _Jv_AddrInfo *info) +_Jv_platform_dladdr (void *addr, _Jv_AddrInfo *info) { int ret_val = 0; diff --git a/libjava/win32.cc b/libjava/win32.cc index a78f814..00b4279 100644 --- a/libjava/win32.cc +++ b/libjava/win32.cc @@ -463,7 +463,7 @@ _Jv_platform_close_on_exec (HANDLE h) // defined symbol to that address. Returns 0 if no object defines this // address. int -_Jv_platform_dladdr (const void *addr, _Jv_AddrInfo *info) +_Jv_platform_dladdr (void *addr, _Jv_AddrInfo *info) { // Since we do not have dladdr() on Windows, we use a trick involving // VirtualQuery() to find the module (EXE or DLL) that contains a given |