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

Matcher.java, [...]: Merge with classpath, new files.

Browse source 
2002-09-18  Michael Koch  <konqueror@gmx.de>

	* java/util/regex/Matcher.java, java/util/regex/Pattern.java,
	java/util/regex/PatternSyntaxException.java:
	Merge with classpath, new files.
	* Makefile.am (core_java_source_files):
	Added java/util/regex/Matcher.java,
	java/util/regex/Pattern.java,
	java/util/regex/PatternSyntaxException.java
	* Makefile.in: Regenerated.
	* include/config.h.in: Added HAVE_NET_IF_H.
	* java/net/natNetworkInterface.cc (getRealNetworkInterfaces):
	Removed #if 0 ... #endif.

From-SVN: r57275
This commit is contained in:
Michael Koch 2002-09-18 10:15:52 +00:00 • committed by Michael Koch
parent 00a892b812
commit a2f2457fa4
8 changed files with 272 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libjava/java/net/natNetworkInterface.cc
View file

@ -70,7 +70,6 @@ java::net::NetworkInterface::getRealNetworkInterfaces ()
::java::util::Vector*
java::net::NetworkInterface::getRealNetworkInterfaces ()
{
#if 0
int fd;
int num_interfaces = 0;
struct ifconf if_data;
@ -128,7 +127,7 @@ java::net::NetworkInterface::getRealNetworkInterfaces ()
}
#ifdef HAVE_INET6
// FIXME: read /proc/net/if_inet6
// FIXME: read /proc/net/if_inet6 (on Linux 2.4)
#endif
_Jv_Free (if_data.ifc_buf);
@ -137,7 +136,6 @@ java::net::NetworkInterface::getRealNetworkInterfaces ()
::close (fd);
return ht;
#endif
}
#endif // DISABLE_JAVA_NET //