From: Andreas Tobler <a.tobler@schweiz.ch>
Date: Tue, 4 Jul 2006 20:21:40 +0000 (+0200)
Subject: re PR libgcj/28226 (posix.cc:222: error: invalid conversion from 'const void*' to... 
X-Git-Tag: releases/gcc-4.2.0~2195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d25f0ebc386ed1a8579c54e3b7d815633daaee1d;p=thirdparty%2Fgcc.git

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
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3e22f23a5d83..fd3b6d0e572c 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 15795ddfdafe..ea4762c6a1bf 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 26c307c1d47b..a461d88f56ca 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 41702dfffb90..d191d8ea7a1c 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 a78f814c6873..00b42796ce46 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