git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andreas Tobler 2006-07-04 22:21:40 +02:00 committed by Andreas Tobler
parent 706601d965
commit d25f0ebc38
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,5 +1,11 @@
2006-07-04 Andreas Tobler <a.tobler@schweiz.ch> 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 * testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar
instead of libgcj-*.jar. instead of libgcj-*.jar.

2
libjava/include/posix.h
View File

@ -199,6 +199,6 @@ struct _Jv_AddrInfo;
// Given an address, determine the executable or shared object that defines // Given an address, determine the executable or shared object that defines
// it and the nearest named symbol. // 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__ */ #endif /* __JV_POSIX_H__ */

2
libjava/include/win32.h
View File

@ -180,6 +180,6 @@ struct _Jv_AddrInfo;
// Given an address, determine the executable or shared object that defines // Given an address, determine the executable or shared object that defines
// it and the nearest named symbol. // 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__ */ #endif /* __JV_WIN32_H__ */

2
libjava/posix.cc
View File

@ -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 // defined symbol to that address. Returns 0 if no object defines this
// address. // address.
int int
_Jv_platform_dladdr (const void *addr, _Jv_AddrInfo *info) _Jv_platform_dladdr (void *addr, _Jv_AddrInfo *info)
{ {
int ret_val = 0; int ret_val = 0;

2
libjava/win32.cc
View File

@ -463,7 +463,7 @@ _Jv_platform_close_on_exec (HANDLE h)
// defined symbol to that address. Returns 0 if no object defines this // defined symbol to that address. Returns 0 if no object defines this
// address. // address.
int 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 // 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 // VirtualQuery() to find the module (EXE or DLL) that contains a given