procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natNetworkInterfaceWin32.cc (getRealNetworkInterfaces): Changed pfn from static local to local.

Browse source 
* java/net/natNetworkInterfaceWin32.cc (getRealNetworkInterfaces):
	Changed pfn from static local to local.

From-SVN: r87099
This commit is contained in:
Mohan Embar 2004-09-05 03:36:19 +00:00 • committed by Mohan Embar
parent 254986c7ff
commit 56fa138baf
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
2004-09-04 Mohan Embar <gnustuff@thisiscool.com>
* java/net/natNetworkInterfaceWin32.cc (getRealNetworkInterfaces):
Changed pfn from static local to local.
2004-09-03 Bryce McKinlay <mckinlay@redhat.com>
H.J. Lu <hongjiu.lu@intel.com>

11
libjava/java/net/natNetworkInterfaceWin32.cc
View file

@ -116,7 +116,16 @@ determineGetRealNetworkInterfacesFN ()
::java::util::Vector*
java::net::NetworkInterface::getRealNetworkInterfaces ()
{
static PfnGetRealNetworkInterfaces pfn =
// This next declaration used to be a static local,
// but this introduced a dependency on libsupc++ due
// to _cxa_guard_acquire and _cxa_guard_release.
// When Win95 is gone and we eventually get rid of
// winsock2GetRealNetworkInterfaces, we can rework
// all of this. Alternatively, we could move this all
// to win32.cc and initialize this at startup time,
// but that seems more trouble than it's worth at
// the moment.
PfnGetRealNetworkInterfaces pfn =
determineGetRealNetworkInterfacesFN ();
jstring arIFName[MAX_INTERFACES];