* native/jni/native-lib/cpnet.c

        (cpnet_aton) Moved variable declaration of inet6_addr so it is
        actually in the scope of its use.

2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d7b7e612..d1a8ac206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-25  Mark Wielaard  <mark@klomp.org>
+
+	* native/jni/native-lib/cpnet.c
+	(cpnet_aton) Moved variable declaration of inet6_addr so it is
+	actually in the scope of its use.
+
 2007-06-25  Dalibor Topic  <robilad@kaffe.org>
 
 	* native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
@@ -28,7 +34,7 @@
 	code conditionally on IPv6 facilities being available.
 	(cpnet_aton) Moved variable declaration of inet6_addr to the scope
 	of its use. Build IPv6 dependant code conditionally 
-        on IPv6 facilities being available.
+	on IPv6 facilities being available.
 
 	* native/jni/native-lib/cpnet.h (cpnet_newIPV6Address, 
 	cpnet_isIPV6Address, cpnet_IPV6AddressToBytes, 
diff --git a/native/jni/native-lib/cpnet.c b/native/jni/native-lib/cpnet.c
index 7017fc172..044498113 100644
--- a/native/jni/native-lib/cpnet.c
+++ b/native/jni/native-lib/cpnet.c
@@ -767,6 +767,10 @@ jint cpnet_aton (JNIEnv *env, const char *hostname, cpnet_address **addr)
 {
   jbyte *bytes = NULL;
 
+#if defined(HAVE_INET_PTON) && defined(HAVE_INET6)
+  jbyte inet6_addr[16];
+#endif
+
 #ifdef HAVE_INET_ATON
   struct in_addr laddr;
   if (inet_aton (hostname, &laddr))
@@ -793,8 +797,6 @@ jint cpnet_aton (JNIEnv *env, const char *hostname, cpnet_address **addr)
 #if defined(HAVE_INET_PTON) && defined(HAVE_INET6)
   if (inet_pton (AF_INET6, hostname, inet6_addr) > 0)
     {
-      jbyte inet6_addr[16];
-
       *addr = cpnet_newIPV6Address(env);
       cpnet_bytesToIPV6Address(*addr, inet6_addr);
       return 0;