On Thu, 2007-04-05 at 14:21 +0200, Christian Thalinger wrote:
> On Wed, 2007-04-04 at 13:36 +0200, Christian Thalinger wrote:
> > Yeah, tomorrow :-) Anyways, here it is. Commit?
>
> Commited as follows.
Had another one of this type pending. Commited.
- twisti
---
2007-04-05 Christian Thalinger <[EMAIL PROTECTED]>
* native/jni/java-net/java_net_VMNetworkInterface.c
[HAVE_IFADDRS_H && HAVE_GETIFADDRS] (free_netif_list): Added
#ifdef.
(getVMInterfaces): Added UNUSED argument attribute.
Index: native/jni/java-net/java_net_VMNetworkInterface.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/java-net/java_net_VMNetworkInterface.c,v
retrieving revision 1.5
diff -u -3 -p -r1.5 java_net_VMNetworkInterface.c
--- native/jni/java-net/java_net_VMNetworkInterface.c 26 Nov 2006 13:31:27
-0000 1.5
+++ native/jni/java-net/java_net_VMNetworkInterface.c 5 Apr 2007 12:30:34
-0000
@@ -96,6 +96,7 @@ struct netif_entry
struct netif_entry *next;
};
+#if defined (HAVE_IFADDRS_H) && defined (HAVE_GETIFADDRS)
static void
free_netif_list (JNIEnv *env, struct netif_entry *list)
{
@@ -106,12 +107,14 @@ free_netif_list (JNIEnv *env, struct net
list = e;
}
}
+#endif
/*
* Returns all local network interfaces as an array.
*/
JNIEXPORT jobjectArray JNICALL
-Java_java_net_VMNetworkInterface_getVMInterfaces (JNIEnv * env, jclass clazz)
+Java_java_net_VMNetworkInterface_getVMInterfaces (JNIEnv * env,
+ jclass clazz UNUSED)
{
#if defined (HAVE_IFADDRS_H) && defined (HAVE_GETIFADDRS)
struct ifaddrs *ifaddrs, *i;
@@ -245,7 +248,7 @@ Java_java_net_VMNetworkInterface_getVMIn
#else
JCL_ThrowException (env, "java/net/SocketException", "getifaddrs not
supported");
return NULL;
-#endif /* HAVE_GETIFADDRS */
+#endif /* HAVE_IFADDRS_H && HAVE_GETIFADDRS */
}
/* end of file */
