diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-18 10:15:52 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-18 10:15:52 +0000 |
| commit | c39848bcc6d3f2d79f20f6b73c91884b0894c16e (patch) | |
| tree | 1d8bfb2afa774223edd8b5583a5dd9e57a957dec /libjava/java/net/natNetworkInterface.cc | |
| parent | 25d17dbc82413cbe3e6255892e3a586e4eac327f (diff) | |
| download | ppe42-gcc-c39848bcc6d3f2d79f20f6b73c91884b0894c16e.tar.gz ppe42-gcc-c39848bcc6d3f2d79f20f6b73c91884b0894c16e.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57275 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/natNetworkInterface.cc')
| -rw-r--r-- | libjava/java/net/natNetworkInterface.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libjava/java/net/natNetworkInterface.cc b/libjava/java/net/natNetworkInterface.cc index 75e904deb86..1d236b012c0 100644 --- a/libjava/java/net/natNetworkInterface.cc +++ b/libjava/java/net/natNetworkInterface.cc @@ -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 // |
