diff options
| author | Michael Koch <konqueror@gmx.de> | 2002-09-18 10:15:52 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2002-09-18 10:15:52 +0000 |
| commit | a2f2457fa482356b5996a084d037d79fdc1a556f (patch) | |
| tree | 1d8bfb2afa774223edd8b5583a5dd9e57a957dec /libjava/java/net | |
| parent | 00a892b812d0a634402bb31a5836147be11bf6a4 (diff) | |
| download | gcc-a2f2457fa482356b5996a084d037d79fdc1a556f.zip gcc-a2f2457fa482356b5996a084d037d79fdc1a556f.tar.gz gcc-a2f2457fa482356b5996a084d037d79fdc1a556f.tar.bz2 | |
Matcher.java, [...]: Merge with classpath, new files.
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
Diffstat (limited to 'libjava/java/net')
| -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 75e904d..1d236b0 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 // |