diff options
| author | Christian Thalinger <twisti@complang.tuwien.ac.at> | 2007-04-05 12:34:19 +0000 |
|---|---|---|
| committer | Christian Thalinger <twisti@complang.tuwien.ac.at> | 2007-04-05 12:34:19 +0000 |
| commit | 676d651101c50bbc5ee9acede3adda1703d64da4 (patch) | |
| tree | b857fd4cdc8de36e33551feb25fe83f7cd1a607e | |
| parent | 3ee8ef1eff9e290fe3bd85c83c632bf40e713ba4 (diff) | |
| download | classpath-676d651101c50bbc5ee9acede3adda1703d64da4.tar.gz | |
2007-04-05 Christian Thalinger <twisti@complang.tuwien.ac.at>
* native/jni/java-net/java_net_VMNetworkInterface.c
[HAVE_IFADDRS_H && HAVE_GETIFADDRS] (free_netif_list): Added
#ifdef.
(getVMInterfaces): Added UNUSED argument attribute.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | native/jni/java-net/java_net_VMNetworkInterface.c | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2007-04-05 Christian Thalinger <twisti@complang.tuwien.ac.at> + * 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 <twisti@complang.tuwien.ac.at> + * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c, native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c [HAVE_ICONV] (createRawData, getData, infid, outfid): Added 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 */ |