From 676d651101c50bbc5ee9acede3adda1703d64da4 Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Thu, 5 Apr 2007 12:34:19 +0000 Subject: 2007-04-05 Christian Thalinger * native/jni/java-net/java_net_VMNetworkInterface.c [HAVE_IFADDRS_H && HAVE_GETIFADDRS] (free_netif_list): Added #ifdef. (getVMInterfaces): Added UNUSED argument attribute. --- ChangeLog | 7 +++++++ native/jni/java-net/java_net_VMNetworkInterface.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 519a0c63b..de2c7c01b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-04-05 Christian Thalinger + + * native/jni/java-net/java_net_VMNetworkInterface.c + [HAVE_IFADDRS_H && HAVE_GETIFADDRS] (free_netif_list): Added + #ifdef. + (getVMInterfaces): Added UNUSED argument attribute. + 2007-04-05 Christian Thalinger * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c, diff --git a/native/jni/java-net/java_net_VMNetworkInterface.c b/native/jni/java-net/java_net_VMNetworkInterface.c index b51bf68ec..73da5ee24 100644 --- a/native/jni/java-net/java_net_VMNetworkInterface.c +++ b/native/jni/java-net/java_net_VMNetworkInterface.c @@ -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 netif_entry *list) 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_getVMInterfaces (JNIEnv * env, jclass clazz) #else JCL_ThrowException (env, "java/net/SocketException", "getifaddrs not supported"); return NULL; -#endif /* HAVE_GETIFADDRS */ +#endif /* HAVE_IFADDRS_H && HAVE_GETIFADDRS */ } /* end of file */ -- cgit v1.2.1