Hi, the attached patch renames a method in KqueueSelectorImpl (this conflicts with the field of the same name in GCJ) and removes the IP_TTL field in VMPlainDatagramSocketImpl. The latter is seemingly not used anywhere and causes a problem during GCJ compilation.
Please comment whether this change is ok?
ChangeLog:
2006-10-03 Robert Schuster <[EMAIL PROTECTED]>
* gnu/java/nio/KqueueSelectorImpl.java: Renamed method
sizeof_struct_kevent to get_sizeof_struct_kevent.
* include/gnu_java_nio_KqueueSelectorImpl.h: Dito.
* native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c: Dito.
* vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java: Removed
unneeded IP_TTL field.
cya
Robert
Index: include/gnu_java_nio_KqueueSelectorImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_nio_KqueueSelectorImpl.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_nio_KqueueSelectorImpl.h
--- include/gnu_java_nio_KqueueSelectorImpl.h 27 Sep 2006 21:19:31 -0000 1.2
+++ include/gnu_java_nio_KqueueSelectorImpl.h 3 Oct 2006 22:11:32 -0000
@@ -29,10 +29,10 @@
/*
* Class: gnu_java_nio_KqueueSelectorImpl
- * Method: sizeof_struct_kevent
+ * Method: get_sizeof_struct_kevent
* Signature: ()I
*/
-JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_sizeof_1struct_1kevent
+JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_get_sizeof_1struct_1kevent
(JNIEnv *, jclass);
/*
Index: native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_nio_KqueueSelectorImpl.c
--- native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c 27 Sep 2006 21:19:31 -0000 1.2
+++ native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c 3 Oct 2006 22:11:32 -0000
@@ -91,11 +91,11 @@
/*
* Class: gnu_java_nio_KqueueSelectorImpl
- * Method: sizeof_struct_kevent
+ * Method: get_sizeof_struct_kevent
* Signature: ()I
*/
JNIEXPORT jint JNICALL
-Java_gnu_java_nio_KqueueSelectorImpl_sizeof_1struct_1kevent
+Java_gnu_java_nio_KqueueSelectorImpl_get_sizeof_1struct_1kevent
(JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused)))
{
#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
Index: gnu/java/nio/KqueueSelectorImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/KqueueSelectorImpl.java,v
retrieving revision 1.2
diff -u -r1.2 KqueueSelectorImpl.java
--- gnu/java/nio/KqueueSelectorImpl.java 27 Sep 2006 21:19:31 -0000 1.2
+++ gnu/java/nio/KqueueSelectorImpl.java 3 Oct 2006 22:11:32 -0000
@@ -80,7 +80,7 @@
}
if (kqueue_supported ())
- sizeof_struct_kevent = sizeof_struct_kevent();
+ sizeof_struct_kevent = get_sizeof_struct_kevent();
else
sizeof_struct_kevent = -1;
INITIAL_CAPACITY = 16 * sizeof_struct_kevent;
@@ -437,10 +437,13 @@
/**
* Return the size of a <code>struct kevent</code> on this system.
+ *
+ * The name of the method is deliberately chosen to not conflict
+ * with the static field.
*
* @return The size of <code>struct kevent</code>.
*/
- private static native int sizeof_struct_kevent();
+ private static native int get_sizeof_struct_kevent();
/**
* Opens a kqueue descriptor.
Index: vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java,v
retrieving revision 1.2
diff -u -r1.2 VMPlainDatagramSocketImpl.java
--- vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java 12 Jan 2006 11:56:08 -0000 1.2
+++ vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java 3 Oct 2006 22:11:32 -0000
@@ -55,12 +55,6 @@
*/
public final class VMPlainDatagramSocketImpl
{
- /**
- * Option id for the IP_TTL (time to live) value.
- */
- static final int IP_TTL = 0x1E61; // 7777
-
-
// Static initializer to load native library
static
{
signature.asc
Description: OpenPGP digital signature
