2005-04-11 Michael Koch <konqueror@gmx.de>

	* java/net/InetAddress.java
	(static): Removed.
	(getLocalHostname): Likewise.
	(lookupInaddrAny): Likewise.
	(getHostByAddr): Likewise.
	(getHostByName): Likewise.
	* java/net/NetworkInterface.java
	(static): Likewise.
	(getRealNetworkInterfaces): Likewise.
	* native/jni/java-net/java_net_InetAddress.c: Renamed to...
	* native/jni/java-net/java_net_VMInetAddress.c: New file.
	Renamed from java_net_InetAddress.c. All native methods moved to class
	VMInetAddress.
	* native/jni/java-net/java_net_NetworkInterface.c: Renamed to...
	Renamed from java_net_NetworkInterface.c. All native methods moved to
	class VMNetworkInterface.
	* native/jni/java-net/java_net_VMNetworkInterface.c: New file.
	* vm/reference/java/net/VMInetAddress.java,
	vm/reference/java/net/VMNetworkInterface.java: New files.
	* include/java_net_InetAddress.h,
	include/java_net_NetworkInterface.h: Removed.
	* include/java_net_VMInetAddress.h,
	include/java_net_VMNetworkInterface.h: New files.
	* include/Makefile.am: Build new header files.

5 files changed, 47 insertions, 55 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 47f6edc61..7064538f7 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -83,8 +83,8 @@ $(top_srcdir)/include/java_lang_VMFloat.h \
 $(top_srcdir)/include/java_lang_VMProcess.h \
 $(top_srcdir)/include/java_lang_VMSystem.h \
 $(top_srcdir)/include/java_lang_reflect_Array.h \
-$(top_srcdir)/include/java_net_InetAddress.h \
-$(top_srcdir)/include/java_net_NetworkInterface.h \
+$(top_srcdir)/include/java_net_VMInetAddress.h \
+$(top_srcdir)/include/java_net_VMNetworkInterface.h \
 $(top_srcdir)/include/java_nio_VMDirectByteBuffer.h \
 $(top_srcdir)/include/java_nio_MappedByteBufferImpl.h \
 $(top_srcdir)/include/java_util_VMTimeZone.h
@@ -135,10 +135,10 @@ $(top_srcdir)/include/java_lang_VMSystem.h: $(top_srcdir)/vm/reference/java/lang
 	$(JAVAH) -o $@ java.lang.VMSystem
 $(top_srcdir)/include/java_lang_reflect_Array.h: $(top_srcdir)/java/lang/reflect/Array.java
 	$(JAVAH) -o $@ java.lang.reflect.Array
-$(top_srcdir)/include/java_net_InetAddress.h: $(top_srcdir)/java/net/InetAddress.java
-	$(JAVAH) -o $@ java.net.InetAddress
-$(top_srcdir)/include/java_net_NetworkInterface.h: $(top_srcdir)/java/net/NetworkInterface.java
-	$(JAVAH) -o $@ java.net.NetworkInterface
+$(top_srcdir)/include/java_net_VMInetAddress.h: $(top_srcdir)/vm/reference/java/net/VMInetAddress.java
+	$(JAVAH) -o $@ java.net.VMInetAddress
+$(top_srcdir)/include/java_net_VMNetworkInterface.h: $(top_srcdir)/vm/reference/java/net/VMNetworkInterface.java
+	$(JAVAH) -o $@ java.net.VMNetworkInterface
 $(top_srcdir)/include/java_nio_VMDirectByteBuffer.h: $(top_srcdir)/vm/reference/java/nio/VMDirectByteBuffer.java
 	$(JAVAH) -o $@ java.nio.VMDirectByteBuffer
 $(top_srcdir)/include/java_nio_MappedByteBufferImpl.h: $(top_srcdir)/java/nio/MappedByteBufferImpl.java
diff --git a/include/java_net_InetAddress.h b/include/java_net_InetAddress.h
deleted file mode 100644
index 55eac7821..000000000
--- a/include/java_net_InetAddress.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_net_InetAddress__
-#define __java_net_InetAddress__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jstring JNICALL Java_java_net_InetAddress_getLocalHostname (JNIEnv *env, jclass);
-JNIEXPORT jbyteArray JNICALL Java_java_net_InetAddress_lookupInaddrAny (JNIEnv *env, jclass);
-JNIEXPORT jstring JNICALL Java_java_net_InetAddress_getHostByAddr (JNIEnv *env, jclass, jbyteArray);
-JNIEXPORT jobjectArray JNICALL Java_java_net_InetAddress_getHostByName (JNIEnv *env, jclass, jstring);
-#undef java_net_InetAddress_serialVersionUID
-#define java_net_InetAddress_serialVersionUID 3286316764910316507LL
-#undef java_net_InetAddress_DEFAULT_CACHE_SIZE
-#define java_net_InetAddress_DEFAULT_CACHE_SIZE 89L
-#undef java_net_InetAddress_DEFAULT_CACHE_PERIOD
-#define java_net_InetAddress_DEFAULT_CACHE_PERIOD 240L
-#undef java_net_InetAddress_DEFAULT_CACHE_PURGE_PCT
-#define java_net_InetAddress_DEFAULT_CACHE_PURGE_PCT 30L
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_net_InetAddress__ */
diff --git a/include/java_net_NetworkInterface.h b/include/java_net_NetworkInterface.h
deleted file mode 100644
index 3a7078290..000000000
--- a/include/java_net_NetworkInterface.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_net_NetworkInterface__
-#define __java_net_NetworkInterface__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT jobject JNICALL Java_java_net_NetworkInterface_getRealNetworkInterfaces (JNIEnv *env, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_net_NetworkInterface__ */
diff --git a/include/java_net_VMInetAddress.h b/include/java_net_VMInetAddress.h
new file mode 100644
index 000000000..54b57f220
--- /dev/null
+++ b/include/java_net_VMInetAddress.h
@@ -0,0 +1,22 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_net_VMInetAddress__
+#define __java_net_VMInetAddress__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT jstring JNICALL Java_java_net_VMInetAddress_getLocalHostname (JNIEnv *env, jclass);
+JNIEXPORT jbyteArray JNICALL Java_java_net_VMInetAddress_lookupInaddrAny (JNIEnv *env, jclass);
+JNIEXPORT jstring JNICALL Java_java_net_VMInetAddress_getHostByAddr (JNIEnv *env, jclass, jbyteArray);
+JNIEXPORT jobjectArray JNICALL Java_java_net_VMInetAddress_getHostByName (JNIEnv *env, jclass, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_net_VMInetAddress__ */
diff --git a/include/java_net_VMNetworkInterface.h b/include/java_net_VMNetworkInterface.h
new file mode 100644
index 000000000..c309357f3
--- /dev/null
+++ b/include/java_net_VMNetworkInterface.h
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_net_VMNetworkInterface__
+#define __java_net_VMNetworkInterface__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT jobject JNICALL Java_java_net_VMNetworkInterface_getInterfaces (JNIEnv *env, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_net_VMNetworkInterface__ */