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

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

From-SVN: r87099

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 94ed50de23a76528b4c16e71c45622a3674e57bb..ece60aa4e9130278301fd3201595eadd99e75e2b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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>
 

diff --git a/libjava/java/net/natNetworkInterfaceWin32.cc b/libjava/java/net/natNetworkInterfaceWin32.cc
index d4c2b173f8931177a72ee5f919e4062d3d40d7d8..429066e1bfb28782abcdfbf8e912397f4e467b18 100644 (file)
--- a/libjava/java/net/natNetworkInterfaceWin32.cc
+++ b/libjava/java/net/natNetworkInterfaceWin32.cc
@@ -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];